changeset 7944:1e20da46a3c7

[SCENEBUILDER] Removed FXOMObject.lookupFirstReference() (no longer used).
author eric.le.ponner@oracle.com
date Tue, 02 Sep 2014 14:19:40 +0200
parents a0da8fd3717c
children 043cd5a12fd9
files apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMCollection.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMInstance.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMIntrinsic.java apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMObject.java
diffstat 4 files changed, 0 insertions(+), 84 deletions(-) [+]
line wrap: on
line diff
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMCollection.java	Tue Sep 02 13:04:14 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMCollection.java	Tue Sep 02 14:19:40 2014 +0200
@@ -190,25 +190,6 @@
     }
 
     @Override
-    public FXOMNode lookupFirstReference(String fxId, FXOMObject scope) {
-        FXOMNode result;
-        
-        if (this == scope) {
-            result = null;
-        } else {
-            result = null;
-            for (FXOMObject i : items) {
-                result = i.lookupFirstReference(fxId, scope);
-                if (result != null) {
-                    break;
-                }
-            }
-        }
-        
-        return result;
-    }
-
-    @Override
     protected void collectIncludes(String source, List<FXOMIntrinsic> result) {
         for (FXOMObject i : items) {
             i.collectIncludes(source, result);
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMInstance.java	Tue Sep 02 13:04:14 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMInstance.java	Tue Sep 02 14:19:40 2014 +0200
@@ -217,44 +217,6 @@
     }
     
     @Override
-    public FXOMNode lookupFirstReference(String fxId, FXOMObject scope) {
-        FXOMNode result;
-        
-        if (this == scope) {
-            result = null;
-        } else {
-            result = null;
-            for (FXOMProperty p : properties.values()) {
-                if (p instanceof FXOMPropertyT) {
-                    final FXOMPropertyT t = (FXOMPropertyT) p;
-                    final PrefixedValue pv = new PrefixedValue(t.getValue());
-                    if (pv.isExpression()) {
-                        final String expression = pv.getSuffix();
-                        if (fxId.equals(expression)) {
-                            result = p;
-                            break;
-                        }
-                    }
-                } else {
-                    assert p instanceof FXOMPropertyC;
-                    final FXOMPropertyC c = (FXOMPropertyC) p;
-                    for (FXOMObject v : c.getValues()) {
-                        result = v.lookupFirstReference(fxId, scope);
-                        if (result != null) {
-                            break;
-                        }
-                    }
-                }
-                if (result != null) {
-                    break;
-                }
-            }
-        }
-        
-        return result;
-    }
-
-    @Override
     protected void collectDeclaredClasses(Set<Class<?>> result) {
         assert result != null;
         
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMIntrinsic.java	Tue Sep 02 13:04:14 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMIntrinsic.java	Tue Sep 02 14:19:40 2014 +0200
@@ -148,31 +148,6 @@
         
         return result;
     }
-    
-    @Override
-    public FXOMNode lookupFirstReference(String fxId, FXOMObject scope) {
-        final FXOMNode result;
-        
-        if (this == scope) {
-            result = null;
-        } else {
-            switch(getType()) {
-                case FX_REFERENCE:
-                case FX_COPY:
-                    if (fxId.equals(getSource())) {
-                        result = this;
-                    } else {
-                        result = null;
-                    }
-                    break;
-                default:
-                    result = null;
-                    break;
-            }
-        }
-        
-        return result;
-    }
 
     @Override
     protected void collectDeclaredClasses(Set<Class<?>> result) {
--- a/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMObject.java	Tue Sep 02 13:04:14 2014 +0200
+++ b/apps/scenebuilder/SceneBuilderKit/src/com/oracle/javafx/scenebuilder/kit/fxom/FXOMObject.java	Tue Sep 02 14:19:40 2014 +0200
@@ -404,8 +404,6 @@
     
     protected abstract void collectReferences(String source, FXOMObject scope, List<FXOMNode> result);
     
-    public abstract FXOMNode lookupFirstReference(String fxId, FXOMObject scope);
-
     public List<FXOMIntrinsic> collectIncludes(String source) {
         final List<FXOMIntrinsic> result = new ArrayList<>();