zontreck/ACLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#445: Add InstanceSortingStrategy

Browse source
This commit is contained in:
s0cks 2021-12-02 04:00:25 -07:00
parent c3d3c2d2db
commit 59334a4fcf
5 changed files with 104 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.idea/ATLauncher.iml
View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="ATLauncher" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.atlauncher" external.system.module.version="3.4.6.1" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

93
src/main/java/com/atlauncher/gui/tabs/InstancesTab.java
View file

@ -22,36 +22,44 @@ import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.util.LinkedList;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import javax.swing.BorderFactory;
import javax.swing.Box;
import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import javax.swing.*;
import com.atlauncher.constants.UIConstants;
import com.atlauncher.data.Instance;
import com.atlauncher.evnt.listener.RelocalizationListener;
import com.atlauncher.evnt.manager.RelocalizationManager;
import com.atlauncher.gui.card.InstanceCard;
import com.atlauncher.gui.card.NilCard;
import com.atlauncher.gui.dialogs.ImportInstanceDialog;
import com.atlauncher.managers.InstanceManager;
import com.atlauncher.managers.LogManager;
import com.atlauncher.network.Analytics;
import com.atlauncher.utils.sort.InstanceSortingStrategies;
import com.atlauncher.utils.sort.InstanceSortingStrategy;
import com.atlauncher.utils.sort.SortingStrategy;
import org.mini2Dx.gettext.GetText;
public class InstancesTab extends JPanel implements Tab, RelocalizationListener {
public class InstancesTab extends JPanel implements Tab, RelocalizationListener, ItemListener{
private static final long serialVersionUID = -969812552965390610L;
private JButton clearButton;
private JTextField searchField;
private JButton searchButton;
private JComboBox<InstanceSortingStrategy> sortingStrategyComboBox;
private InstanceSortingStrategy sortingStrategy = InstanceSortingStrategies.BY_NAME;
private String searchText = null;
private JPanel panel;
@ -60,6 +68,8 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
private NilCard nilCard;
private final List<InstanceCard> cards = new LinkedList<>();
public InstancesTab() {
setLayout(new BorderLayout());
loadContent(false);
@ -99,6 +109,10 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
reload();
});
this.sortingStrategyComboBox = new JComboBox<>(InstanceSortingStrategies.values());
this.sortingStrategyComboBox.setSelectedItem(this.sortingStrategy);
this.sortingStrategyComboBox.addItemListener(this);
topPanel.setLayout(new BoxLayout(topPanel, BoxLayout.X_AXIS));
topPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
@ -109,6 +123,8 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
topPanel.add(searchButton);
topPanel.add(Box.createHorizontalStrut(5));
topPanel.add(clearButton);
topPanel.add(Box.createHorizontalStrut(5));
topPanel.add(this.sortingStrategyComboBox);
add(topPanel, BorderLayout.NORTH);
@ -126,26 +142,16 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
gbc.insets = UIConstants.FIELD_INSETS;
gbc.fill = GridBagConstraints.BOTH;
InstanceManager.getInstancesSorted().forEach(instance -> {
if (keepFilters) {
boolean showInstance = true;
if (searchText != null) {
if (!Pattern.compile(Pattern.quote(searchText), Pattern.CASE_INSENSITIVE)
.matcher(instance.launcher.name).find()) {
showInstance = false;
}
}
if (showInstance) {
panel.add(new InstanceCard(instance), gbc);
gbc.gridy++;
}
} else {
panel.add(new InstanceCard(instance), gbc);
gbc.gridy++;
}
});
if(keepFilters){
InstanceManager.getInstancesSorted().stream()
.filter(this.createFilter())
.sorted(this.sortingStrategy)
.forEach(this.createInstanceCard(gbc));
} else{
InstanceManager.getInstancesSorted().stream()
.sorted(this.sortingStrategy)
.forEach(this.createInstanceCard(gbc));
}
if (panel.getComponentCount() == 0) {
nilCard = new NilCard(GetText.tr("There are no instances to display.\n\nInstall one from the Packs tab."));
@ -155,6 +161,25 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
SwingUtilities.invokeLater(() -> scrollPane.getVerticalScrollBar().setValue(currentPosition));
}
private Predicate<Instance> searchTextFilter(){
final Pattern searchTextPattern = Pattern.compile(Pattern.quote(this.searchText), Pattern.CASE_INSENSITIVE);
return (val)->searchTextPattern.matcher(val.launcher.name).find();
}
private Predicate<Instance> createFilter(){
if(this.searchText == null){
return (val)->true;
}
return this.searchTextFilter();
}
private Consumer<Instance> createInstanceCard(final GridBagConstraints gbc){
return (val)->{
panel.add(new InstanceCard(val), gbc);
gbc.gridy++;
};
}
public void reload() {
this.currentPosition = scrollPane.getVerticalScrollBar().getValue();
this.searchText = searchField.getText();
@ -187,4 +212,14 @@ public class InstancesTab extends JPanel implements Tab, RelocalizationListener
nilCard.setMessage(GetText.tr("There are no instances to display.\n\nInstall one from the Packs tab."));
}
}
@Override
public void itemStateChanged(ItemEvent e){
if(e.getStateChange() == ItemEvent.SELECTED){
InstanceSortingStrategy strategy = (InstanceSortingStrategy)e.getItem();
LogManager.info("using " + strategy.getName() + " sorting strategy");
this.sortingStrategy = strategy;
this.loadContent(true);
}
}
}

28
src/main/java/com/atlauncher/utils/sort/InstanceSortingStrategies.java Normal file
View file

@ -0,0 +1,28 @@
package com.atlauncher.utils.sort;
import com.atlauncher.data.Instance;
public enum InstanceSortingStrategies implements InstanceSortingStrategy{
BY_NAME("By Name"){
@Override
public int compare(Instance lhs, Instance rhs){
return lhs.getName().compareToIgnoreCase(rhs.getName());
}
};
private final String name;
InstanceSortingStrategies(final String name){
this.name = name;
}
@Override
public String getName(){
return this.name;
}
@Override
public String toString(){
return this.name;
}
}

5
src/main/java/com/atlauncher/utils/sort/InstanceSortingStrategy.java Normal file
View file

@ -0,0 +1,5 @@
package com.atlauncher.utils.sort;
import com.atlauncher.data.Instance;
public interface InstanceSortingStrategy extends SortingStrategy<Instance>{}

7
src/main/java/com/atlauncher/utils/sort/SortingStrategy.java Normal file
View file

@ -0,0 +1,7 @@
package com.atlauncher.utils.sort;
import java.util.Comparator;
public interface SortingStrategy<T> extends Comparator<T>{
String getName();
}