X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fflag%2FFlagPropertyTester.java;fp=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fflag%2FFlagPropertyTester.java;h=ade5987ab85398b502b76adf215808858131e657;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=67b5808fb7f97eebb042387e9bb3bbfb46ec7948;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagPropertyTester.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagPropertyTester.java
index 67b5808fb..ade5987ab 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagPropertyTester.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagPropertyTester.java
@@ -1,120 +1,120 @@
-/*******************************************************************************
- * 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.diagram.flag;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.simantics.DatabaseJob;
-import org.simantics.db.ReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.Session;
-import org.simantics.db.common.request.UniqueRead;
-import org.simantics.db.common.utils.RequestUtil;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.ui.SimanticsUI;
-import org.simantics.ui.utils.ResourceAdaptionUtils;
-
-/**
- * An Eclipse property tester for flag elements.
- * 
- * @author Tuukka Lehtonen
- */
-public class FlagPropertyTester extends PropertyTester {
-
-    /**
-     * Tests if the received flag resource is connected to a counterpart.
-     * Default expected value is true.
-     */
-    private static final String CONNECTED = "connected";
-
-    /**
-     * Tests if the received flag resource is connected to a counterpart.
-     * Default expected value is true.
-     */
-    private static final String LOCALLY_CONNECTED = "locallyConnected";
-
-    /**
-     * Tests if the received flag resource is marked as an external flag.
-     */
-    private static final String EXTERNAL = "external";
-
-    /**
-     * Tests if the received flag resource is a merged flag with more than 1
-     * counterpart.
-     */
-    private static final String MERGED = "merged";
-
-    @Override
-    public boolean test(Object receiver, final String property, final Object[] args, final Object expectedValue) {
-        final Resource resource = ResourceAdaptionUtils.toSingleResource(receiver);
-        if (resource == null)
-            return false;
-
-        Session session = SimanticsUI.peekSession();
-        if (session == null)
-            return false;
-
-        if (DatabaseJob.inProgress())
-            return false;
-
-        try {
-            return RequestUtil.trySyncRequest(
-                    session,
-                    SimanticsUI.UI_THREAD_REQUEST_START_TIMEOUT,
-                    SimanticsUI.UI_THREAD_REQUEST_EXECUTION_TIMEOUT,
-                    false,
-                    new UniqueRead<Boolean>() {
-                @Override
-                public Boolean perform(ReadGraph g) throws DatabaseException {
-                    return Boolean.valueOf(doTest(g, resource, property, args, expectedValue));
-                }
-            });
-        } catch (DatabaseException | InterruptedException e) {
-            // Purposefully not logging these exceptions, there might be way too
-            // many even under normal circumstances.
-            // TODO: add debug tracing options controlling the printing of these exceptions
-            return false;
-        }
-    }
-
-    private boolean doTest(ReadGraph graph, Resource resource, String property, Object[] args, Object expectedValue) throws DatabaseException {
-        if (EXTERNAL.equals(property)) {
-            boolean expected = parseBoolean(expectedValue, true);
-            boolean ext = FlagUtil.isExternal(graph, resource);
-            return ext ? expected : expected;
-        } else if (CONNECTED.equals(property)) {
-            boolean expected = parseBoolean(expectedValue, true);
-            boolean isConnected = 
-                FlagUtil.countCounterparts(graph, resource) > 0 ||
-                FlagUtil.isLifted(graph, resource);
-            return isConnected == expected;
-        } else if (LOCALLY_CONNECTED.equals(property)) {
-            boolean expected = parseBoolean(expectedValue, true);
-            boolean isLocallyConnected = 
-                FlagUtil.isJoinedInSingleDiagram(graph, resource);
-            return isLocallyConnected == expected;
-        } else if (MERGED.equals(property)) {
-            boolean expected = parseBoolean(expectedValue, true);
-            boolean isMerged = FlagUtil.countCounterparts(graph, resource) > 1;
-            return isMerged == expected;
-        }
-        return false;
-    }
-
-    boolean parseBoolean(Object value, boolean defaultValue) {
-        if (value instanceof Boolean)
-            return (Boolean) value;
-        if (value instanceof String)
-            return Boolean.parseBoolean((String) value);
-        return defaultValue;
-    }
-
-}
+/*******************************************************************************
+ * 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.diagram.flag;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.simantics.DatabaseJob;
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.Session;
+import org.simantics.db.common.request.UniqueRead;
+import org.simantics.db.common.utils.RequestUtil;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.ui.SimanticsUI;
+import org.simantics.ui.utils.ResourceAdaptionUtils;
+
+/**
+ * An Eclipse property tester for flag elements.
+ * 
+ * @author Tuukka Lehtonen
+ */
+public class FlagPropertyTester extends PropertyTester {
+
+    /**
+     * Tests if the received flag resource is connected to a counterpart.
+     * Default expected value is true.
+     */
+    private static final String CONNECTED = "connected";
+
+    /**
+     * Tests if the received flag resource is connected to a counterpart.
+     * Default expected value is true.
+     */
+    private static final String LOCALLY_CONNECTED = "locallyConnected";
+
+    /**
+     * Tests if the received flag resource is marked as an external flag.
+     */
+    private static final String EXTERNAL = "external";
+
+    /**
+     * Tests if the received flag resource is a merged flag with more than 1
+     * counterpart.
+     */
+    private static final String MERGED = "merged";
+
+    @Override
+    public boolean test(Object receiver, final String property, final Object[] args, final Object expectedValue) {
+        final Resource resource = ResourceAdaptionUtils.toSingleResource(receiver);
+        if (resource == null)
+            return false;
+
+        Session session = SimanticsUI.peekSession();
+        if (session == null)
+            return false;
+
+        if (DatabaseJob.inProgress())
+            return false;
+
+        try {
+            return RequestUtil.trySyncRequest(
+                    session,
+                    SimanticsUI.UI_THREAD_REQUEST_START_TIMEOUT,
+                    SimanticsUI.UI_THREAD_REQUEST_EXECUTION_TIMEOUT,
+                    false,
+                    new UniqueRead<Boolean>() {
+                @Override
+                public Boolean perform(ReadGraph g) throws DatabaseException {
+                    return Boolean.valueOf(doTest(g, resource, property, args, expectedValue));
+                }
+            });
+        } catch (DatabaseException | InterruptedException e) {
+            // Purposefully not logging these exceptions, there might be way too
+            // many even under normal circumstances.
+            // TODO: add debug tracing options controlling the printing of these exceptions
+            return false;
+        }
+    }
+
+    private boolean doTest(ReadGraph graph, Resource resource, String property, Object[] args, Object expectedValue) throws DatabaseException {
+        if (EXTERNAL.equals(property)) {
+            boolean expected = parseBoolean(expectedValue, true);
+            boolean ext = FlagUtil.isExternal(graph, resource);
+            return ext ? expected : expected;
+        } else if (CONNECTED.equals(property)) {
+            boolean expected = parseBoolean(expectedValue, true);
+            boolean isConnected = 
+                FlagUtil.countCounterparts(graph, resource) > 0 ||
+                FlagUtil.isLifted(graph, resource);
+            return isConnected == expected;
+        } else if (LOCALLY_CONNECTED.equals(property)) {
+            boolean expected = parseBoolean(expectedValue, true);
+            boolean isLocallyConnected = 
+                FlagUtil.isJoinedInSingleDiagram(graph, resource);
+            return isLocallyConnected == expected;
+        } else if (MERGED.equals(property)) {
+            boolean expected = parseBoolean(expectedValue, true);
+            boolean isMerged = FlagUtil.countCounterparts(graph, resource) > 1;
+            return isMerged == expected;
+        }
+        return false;
+    }
+
+    boolean parseBoolean(Object value, boolean defaultValue) {
+        if (value instanceof Boolean)
+            return (Boolean) value;
+        if (value instanceof String)
+            return Boolean.parseBoolean((String) value);
+        return defaultValue;
+    }
+
+}