BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-11 01:32:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

fixed z-order selection

Browse Source
This commit is contained in:
bancika
2011-01-08 14:18:05 +00:00
parent ca1d71e2eb
commit a4309a169c
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/ComparatorFactory.java
+10 -14
View File
@@ -1,9 +1,8 @@
package org.diylc.presenter; package org.diylc.presenter;
import java.util.Comparator; import java.util.Comparator;
import java.util.Map; import java.util.List;
import org.diylc.common.ComponentType;
import org.diylc.core.IDIYComponent; import org.diylc.core.IDIYComponent;
public class ComparatorFactory { public class ComparatorFactory {
@@ -11,7 +10,6 @@ public class ComparatorFactory {
private static ComparatorFactory instance; private static ComparatorFactory instance;
private Comparator<IDIYComponent<?>> componentNameComparator; private Comparator<IDIYComponent<?>> componentNameComparator;
private Comparator<IDIYComponent<?>> componentZOrderComparator;
public static ComparatorFactory getInstance() { public static ComparatorFactory getInstance() {
if (instance == null) { if (instance == null) {
@@ -39,18 +37,16 @@ public class ComparatorFactory {
} }
public Comparator<IDIYComponent<?>> getComponentZOrderComparator( public Comparator<IDIYComponent<?>> getComponentZOrderComparator(
final Map<Class<? extends IDIYComponent>, ComponentType> componentTypeMap) { final List<IDIYComponent<?>> components) {
if (componentZOrderComparator == null) { Comparator<IDIYComponent<?>> componentZOrderComparator = new Comparator<IDIYComponent<?>>() {
componentZOrderComparator = new Comparator<IDIYComponent<?>>() {
@Override @Override
public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) { public int compare(IDIYComponent<?> o1, IDIYComponent<?> o2) {
int zIndex1 = componentTypeMap.get(o1.getClass()).getLayer().ordinal(); int index1 = components.indexOf(o1);
int zIndex2 = componentTypeMap.get(o2.getClass()).getLayer().ordinal(); int index2 = components.indexOf(o2);
return new Integer(zIndex1).compareTo(zIndex2); return new Integer(index1).compareTo(index2);
} }
}; };
}
return componentZOrderComparator; return componentZOrderComparator;
} }
} }
diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/presenter/Presenter.java
+1 -1
View File
@@ -404,7 +404,7 @@ public class Presenter implements IPlugInPort {
} }
// Sort by z-order. // Sort by z-order.
Collections.sort(components, ComparatorFactory.getInstance().getComponentZOrderComparator( Collections.sort(components, ComparatorFactory.getInstance().getComponentZOrderComparator(
componentTypeMap)); currentProject.getComponents()));
return components; return components;
} }