X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Flayers%2FSimpleLayers.java;fp=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Flayers%2FSimpleLayers.java;h=f250449a41e5ea352198c5a097565ce35cb8a94d;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=19393f4c13973e9252a5f3f76ec3a56df90fb1b5;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/layers/SimpleLayers.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/layers/SimpleLayers.java
index 19393f4c1..f250449a4 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/layers/SimpleLayers.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/layers/SimpleLayers.java
@@ -1,206 +1,206 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.g2d.layers;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-/**
- * @author Antti Villberg
- */
-public class SimpleLayers implements ILayersEditor {
-
-    private static final Comparator<ILayer> LAYER_COMPARATOR = new Comparator<ILayer>() {
-        @Override
-        public int compare(ILayer o1, ILayer o2) {
-            return o1.getName().compareTo(o2.getName());
-        }
-    };
-
-    private Set<ILayer>                                 all                      = new TreeSet<ILayer>(LAYER_COMPARATOR);
-    private volatile Set<ILayer>                        allSnapshot;
-
-    private Set<ILayer>                                 visible                  = new TreeSet<ILayer>(LAYER_COMPARATOR);
-    private volatile Set<ILayer>                        visibleSnapshot;
-
-    private CopyOnWriteArrayList<ILayersEditorListener> listeners                = new CopyOnWriteArrayList<ILayersEditorListener>();
-
-    private boolean                                     ignoreFocusSettings      = false;
-
-    private boolean                                     ignoreVisibilitySettings = false;
-
-    public SimpleLayers() {
-    }
-
-    public SimpleLayers(String... content) {
-        for (String s : content) {
-            ILayer layer = new SimpleLayer(s);
-            all.add(layer);
-            visible.add(layer);
-        }
-        allSnapshot = null;
-        visibleSnapshot = null;
-    }
-
-    @Override
-    public Set<ILayer> getLayers() {
-        // Double-checked locking idiom: http://en.wikipedia.org/wiki/Double-checked_locking
-        // Works with acquire/release semantics for volatile
-        // Broken under Java 1.4 and earlier semantics for volatile
-        if (allSnapshot == null) {
-            synchronized (this) {
-                if (allSnapshot == null) {
-                    TreeSet<ILayer> ss = new TreeSet<ILayer>(LAYER_COMPARATOR);
-                    ss.addAll(all);
-                    allSnapshot = Collections.unmodifiableSet(ss);
-                }
-            }
-        }
-        return allSnapshot;
-    }
-
-    @Override
-    public Set<ILayer> getVisibleLayers() {
-        // Double-checked locking idiom: http://en.wikipedia.org/wiki/Double-checked_locking
-        // Works with acquire/release semantics for volatile
-        // Broken under Java 1.4 and earlier semantics for volatile
-        if (visibleSnapshot == null) {
-            synchronized (this) {
-                if (visibleSnapshot == null) {
-                    TreeSet<ILayer> ss = new TreeSet<ILayer>(LAYER_COMPARATOR);
-                    ss.addAll(visible);
-                    visibleSnapshot = Collections.unmodifiableSet(ss);
-                }
-            }
-        }
-        return visibleSnapshot;
-    }
-
-    @Override
-    public boolean isActive(ILayer layer) {
-        synchronized (this) {
-            return visible.contains(layer);
-        }
-    }
-
-    @Override
-    public void deactivate(ILayer layer) {
-        boolean deactivated = false;
-        synchronized (this) {
-            deactivated = visible.remove(layer);
-        }
-        if (deactivated) {
-            synchronized (this) {
-                visibleSnapshot = null;
-            }
-            for (ILayersEditorListener listener : listeners) {
-                listener.layerDeactivated(layer);
-            }
-        }
-    }
-
-    @Override
-    public void activate(ILayer layer) {
-        boolean activated = false;
-        synchronized (this) {
-            activated = visible.add(layer);
-        }
-        if (activated) {
-            synchronized (this) {
-                visibleSnapshot = null;
-            }
-            for (ILayersEditorListener listener : listeners) {
-                listener.layerActivated(layer);
-            }
-        }
-    }
-
-    @Override
-    public void addLayer(ILayer layer) {
-        boolean added = false;
-        synchronized (this) {
-            added = all.add(layer);
-        }
-        if (added) {
-            synchronized (this) {
-                allSnapshot = null;
-            }
-            for (ILayersEditorListener listener : listeners) {
-                listener.layerAdded(layer);
-            }
-        }
-    }
-
-    @Override
-    public void removeLayer(ILayer layer) {
-        boolean removed = false;
-        synchronized (this) {
-            removed = all.remove(layer);
-            visible.remove(layer);
-        }
-        if (removed) {
-            synchronized (this) {
-                allSnapshot = null;
-                visibleSnapshot = null;
-            }
-            for (ILayersEditorListener listener : listeners) {
-                listener.layerRemoved(layer);
-            }
-        }
-    }
-
-    @Override
-    public void addListener(ILayersEditorListener listener) {
-        listeners.add(listener);
-    }
-
-    @Override
-    public void removeListener(ILayersEditorListener listener) {
-        listeners.remove(listener);
-    }
-
-    @Override
-    public boolean getIgnoreFocusSettings() {
-        return ignoreFocusSettings;
-    }
-
-    @Override
-    public void setIgnoreFocusSettings(boolean value) {
-        boolean changed = ignoreFocusSettings != value;
-        ignoreFocusSettings = value;
-        if (changed) {
-            for (ILayersEditorListener listener : listeners) {
-                listener.ignoreFocusChanged(value);
-            }
-        }
-    }
-
-    @Override
-    public boolean getIgnoreVisibilitySettings() {
-        return ignoreVisibilitySettings;
-    }
-
-    @Override
-    public void setIgnoreVisibilitySettings(boolean value) {
-        boolean changed = ignoreVisibilitySettings != value;
-        ignoreVisibilitySettings = value;
-        if (changed) {
-            for (ILayersEditorListener listener : listeners) {
-                listener.ignoreVisibilityChanged(value);
-            }
-        }
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.g2d.layers;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * @author Antti Villberg
+ */
+public class SimpleLayers implements ILayersEditor {
+
+    private static final Comparator<ILayer> LAYER_COMPARATOR = new Comparator<ILayer>() {
+        @Override
+        public int compare(ILayer o1, ILayer o2) {
+            return o1.getName().compareTo(o2.getName());
+        }
+    };
+
+    private Set<ILayer>                                 all                      = new TreeSet<ILayer>(LAYER_COMPARATOR);
+    private volatile Set<ILayer>                        allSnapshot;
+
+    private Set<ILayer>                                 visible                  = new TreeSet<ILayer>(LAYER_COMPARATOR);
+    private volatile Set<ILayer>                        visibleSnapshot;
+
+    private CopyOnWriteArrayList<ILayersEditorListener> listeners                = new CopyOnWriteArrayList<ILayersEditorListener>();
+
+    private boolean                                     ignoreFocusSettings      = false;
+
+    private boolean                                     ignoreVisibilitySettings = false;
+
+    public SimpleLayers() {
+    }
+
+    public SimpleLayers(String... content) {
+        for (String s : content) {
+            ILayer layer = new SimpleLayer(s);
+            all.add(layer);
+            visible.add(layer);
+        }
+        allSnapshot = null;
+        visibleSnapshot = null;
+    }
+
+    @Override
+    public Set<ILayer> getLayers() {
+        // Double-checked locking idiom: http://en.wikipedia.org/wiki/Double-checked_locking
+        // Works with acquire/release semantics for volatile
+        // Broken under Java 1.4 and earlier semantics for volatile
+        if (allSnapshot == null) {
+            synchronized (this) {
+                if (allSnapshot == null) {
+                    TreeSet<ILayer> ss = new TreeSet<ILayer>(LAYER_COMPARATOR);
+                    ss.addAll(all);
+                    allSnapshot = Collections.unmodifiableSet(ss);
+                }
+            }
+        }
+        return allSnapshot;
+    }
+
+    @Override
+    public Set<ILayer> getVisibleLayers() {
+        // Double-checked locking idiom: http://en.wikipedia.org/wiki/Double-checked_locking
+        // Works with acquire/release semantics for volatile
+        // Broken under Java 1.4 and earlier semantics for volatile
+        if (visibleSnapshot == null) {
+            synchronized (this) {
+                if (visibleSnapshot == null) {
+                    TreeSet<ILayer> ss = new TreeSet<ILayer>(LAYER_COMPARATOR);
+                    ss.addAll(visible);
+                    visibleSnapshot = Collections.unmodifiableSet(ss);
+                }
+            }
+        }
+        return visibleSnapshot;
+    }
+
+    @Override
+    public boolean isActive(ILayer layer) {
+        synchronized (this) {
+            return visible.contains(layer);
+        }
+    }
+
+    @Override
+    public void deactivate(ILayer layer) {
+        boolean deactivated = false;
+        synchronized (this) {
+            deactivated = visible.remove(layer);
+        }
+        if (deactivated) {
+            synchronized (this) {
+                visibleSnapshot = null;
+            }
+            for (ILayersEditorListener listener : listeners) {
+                listener.layerDeactivated(layer);
+            }
+        }
+    }
+
+    @Override
+    public void activate(ILayer layer) {
+        boolean activated = false;
+        synchronized (this) {
+            activated = visible.add(layer);
+        }
+        if (activated) {
+            synchronized (this) {
+                visibleSnapshot = null;
+            }
+            for (ILayersEditorListener listener : listeners) {
+                listener.layerActivated(layer);
+            }
+        }
+    }
+
+    @Override
+    public void addLayer(ILayer layer) {
+        boolean added = false;
+        synchronized (this) {
+            added = all.add(layer);
+        }
+        if (added) {
+            synchronized (this) {
+                allSnapshot = null;
+            }
+            for (ILayersEditorListener listener : listeners) {
+                listener.layerAdded(layer);
+            }
+        }
+    }
+
+    @Override
+    public void removeLayer(ILayer layer) {
+        boolean removed = false;
+        synchronized (this) {
+            removed = all.remove(layer);
+            visible.remove(layer);
+        }
+        if (removed) {
+            synchronized (this) {
+                allSnapshot = null;
+                visibleSnapshot = null;
+            }
+            for (ILayersEditorListener listener : listeners) {
+                listener.layerRemoved(layer);
+            }
+        }
+    }
+
+    @Override
+    public void addListener(ILayersEditorListener listener) {
+        listeners.add(listener);
+    }
+
+    @Override
+    public void removeListener(ILayersEditorListener listener) {
+        listeners.remove(listener);
+    }
+
+    @Override
+    public boolean getIgnoreFocusSettings() {
+        return ignoreFocusSettings;
+    }
+
+    @Override
+    public void setIgnoreFocusSettings(boolean value) {
+        boolean changed = ignoreFocusSettings != value;
+        ignoreFocusSettings = value;
+        if (changed) {
+            for (ILayersEditorListener listener : listeners) {
+                listener.ignoreFocusChanged(value);
+            }
+        }
+    }
+
+    @Override
+    public boolean getIgnoreVisibilitySettings() {
+        return ignoreVisibilitySettings;
+    }
+
+    @Override
+    public void setIgnoreVisibilitySettings(boolean value) {
+        boolean changed = ignoreVisibilitySettings != value;
+        ignoreVisibilitySettings = value;
+        if (changed) {
+            for (ILayersEditorListener listener : listeners) {
+                listener.ignoreVisibilityChanged(value);
+            }
+        }
+    }
+
+}