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

fixed npe

Browse Source
This commit is contained in:
bancika
2011-01-09 23:38:37 +00:00
parent 5f860348df
commit 481c28d835
1 changed files with 30 additions and 30 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/Presenter.java
+30 -30
View File
@@ -86,8 +86,8 @@ public class Presenter implements IPlugInPort {
private MessageDispatcher<EventType> messageDispatcher; private MessageDispatcher<EventType> messageDispatcher;
// Layers // Layers
// private Set<ComponentLayer> lockedLayers; // private Set<ComponentLayer> lockedLayers;
// private Set<ComponentLayer> visibleLayers; // private Set<ComponentLayer> visibleLayers;
// D&D // D&D
private boolean dragInProgress = false; private boolean dragInProgress = false;
@@ -109,8 +109,8 @@ public class Presenter implements IPlugInPort {
currentProject = new Project(); currentProject = new Project();
cloner = new Cloner(); cloner = new Cloner();
// lockedLayers = EnumSet.noneOf(ComponentLayer.class); // lockedLayers = EnumSet.noneOf(ComponentLayer.class);
// visibleLayers = EnumSet.allOf(ComponentLayer.class); // visibleLayers = EnumSet.allOf(ComponentLayer.class);
} }
public void installPlugin(IPlugIn plugIn) { public void installPlugin(IPlugIn plugIn) {
@@ -573,7 +573,7 @@ public class Presenter implements IPlugInPort {
selectedComponents.clear(); selectedComponents.clear();
for (IDIYComponent<?> component : currentProject.getComponents()) { for (IDIYComponent<?> component : currentProject.getComponents()) {
Area area = componentAreaMap.get(component); Area area = componentAreaMap.get(component);
if ((area != null) && area.intersects(selectionRect)) { if ((area != null) && (selectionRect != null) && area.intersects(selectionRect)) {
selectedComponents.add(component); selectedComponents.add(component);
} }
} }
@@ -605,31 +605,31 @@ public class Presenter implements IPlugInPort {
messageDispatcher.dispatchMessage(EventType.REPAINT); messageDispatcher.dispatchMessage(EventType.REPAINT);
} }
// public boolean isLayerLocked(ComponentLayer layer) { // public boolean isLayerLocked(ComponentLayer layer) {
// return lockedLayers.contains(layer); // return lockedLayers.contains(layer);
// } // }
// //
// public void setLayerLocked(ComponentLayer layer, boolean locked) { // public void setLayerLocked(ComponentLayer layer, boolean locked) {
// LOG.debug(String.format("setLayerLocked(%s, %s)", layer, locked)); // LOG.debug(String.format("setLayerLocked(%s, %s)", layer, locked));
// if (locked) { // if (locked) {
// lockedLayers.add(layer); // lockedLayers.add(layer);
// } else { // } else {
// lockedLayers.remove(layer); // lockedLayers.remove(layer);
// } // }
// } // }
// //
// public boolean isLayerVisible(ComponentLayer layer) { // public boolean isLayerVisible(ComponentLayer layer) {
// return visibleLayers.contains(layer); // return visibleLayers.contains(layer);
// } // }
// //
// public void setLayerVisible(ComponentLayer layer, boolean visible) { // public void setLayerVisible(ComponentLayer layer, boolean visible) {
// LOG.debug(String.format("setLayerVisible(%s, %s)", layer, visible)); // LOG.debug(String.format("setLayerVisible(%s, %s)", layer, visible));
// if (visible) { // if (visible) {
// visibleLayers.add(layer); // visibleLayers.add(layer);
// } else { // } else {
// visibleLayers.remove(layer); // visibleLayers.remove(layer);
// } // }
// } // }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override