From 043bd03f3df17a137451cf51e2f9f01b251737c2 Mon Sep 17 00:00:00 2001 From: luukkainen Date: Thu, 1 Sep 2011 08:54:15 +0000 Subject: [PATCH] Cleaning up compiler warnings git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@22018 ac1ea38d-2e2b-0410-8846-a27921b304fc --- .../interop/browsing/ImportNode.java | 32 ++--------------- .../interop/browsing/ImportNode2.java | 34 +++---------------- .../interop/browsing/InteropChildRule.java | 5 ++- .../interop/handlers/Contributor1.java | 28 ++------------- .../interop/handlers/Contributor2.java | 3 +- .../interop/handlers/EvaluatorFactory1.java | 6 +--- .../simantics/interop/ui/IssuesViewPart.java | 1 + .../interop/utils/StringColumnComparator.java | 1 + 8 files changed, 15 insertions(+), 95 deletions(-) diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java index 51ef7e9..496eb9b 100644 --- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java +++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode.java @@ -14,9 +14,9 @@ import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.interop.Activator; import org.simantics.interop.stubs.InteropResource; -import org.simantics.layer0.Layer0; import org.simantics.modeling.ui.modelBrowser.model.INode; +@SuppressWarnings("deprecation") public class ImportNode implements INode { //private Resource project; @@ -26,6 +26,7 @@ public class ImportNode implements INode { this.model = project; } + @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { return null; @@ -73,19 +74,8 @@ public class ImportNode implements INode { @Override public Collection getChildren(ReadGraph graph) throws DatabaseException { List nodes = new ArrayList(); - Layer0 l0 = Layer0.getInstance(graph); InteropResource i = InteropResource.getInstance(graph); -// Collection models = graph.getObjects(project, b.ConsistsOf); -// for (Resource m : models) { -// Collection objs = graph.getObjects(m, b.ConsistsOf); -// for (Resource o : objs) { -// if (graph.isInstanceOf(o, i.ImportLibrary)) { -// INode node = graph.adapt(o, INode.class); -// nodes.add(node); -// } -// } -// } - //Collection objs = graph.getObjects(model, b.ConsistsOf); + Collection objs = graph.getObjects(model, i.HasImportData); for (Resource o : objs) { if (graph.isInstanceOf(o, i.ImportLibrary)) { @@ -95,22 +85,6 @@ public class ImportNode implements INode { } return nodes; -// ComosResource c = ComosResource.getInstance(graph); -// Collection models = graph.getObjects(project, b.ConsistsOf); -// Collection comosImports = new ArrayList(); -// for (Resource m : models) { -// Collection objs = graph.getObjects(m, b.ConsistsOf); -// for (Resource o : objs) { -// if (graph.isInstanceOf(o, c.ComosImportLibrary)) { -// String icon_db_path = ComosGraphTools.getIconPath(o, graph); -// if (icon_db_path == null) -// continue; -// ComosIconReader iconReader = new ComosIconReader(icon_db_path); -// comosImports.add(new ComosGraphNode(o, iconReader)); -// } -// } -// } -// return comosImports; } diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java index 8bb6d74..54a8ada 100644 --- a/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java +++ b/org.simantics.interop/src/org/simantics/interop/browsing/ImportNode2.java @@ -14,9 +14,9 @@ import org.simantics.db.WriteGraph; import org.simantics.db.exception.DatabaseException; import org.simantics.interop.Activator; import org.simantics.interop.stubs.InteropResource; -import org.simantics.layer0.Layer0; import org.simantics.modeling.ui.modelBrowser.model.INode; +@SuppressWarnings("deprecation") public class ImportNode2 implements INode { private Resource project; @@ -25,6 +25,7 @@ public class ImportNode2 implements INode { this.project = project; } + @SuppressWarnings("rawtypes") @Override public Object getAdapter(Class adapter) { return null; @@ -72,19 +73,8 @@ public class ImportNode2 implements INode { @Override public Collection getChildren(ReadGraph graph) throws DatabaseException { List nodes = new ArrayList(); - Layer0 l0 = Layer0.getInstance(graph); InteropResource i = InteropResource.getInstance(graph); -// Collection models = graph.getObjects(project, b.ConsistsOf); -// for (Resource m : models) { -// Collection objs = graph.getObjects(m, b.ConsistsOf); -// for (Resource o : objs) { -// if (graph.isInstanceOf(o, i.ImportLibrary)) { -// INode node = graph.adapt(o, INode.class); -// nodes.add(node); -// } -// } -// } - //Collection objs = graph.getObjects(project, b.ConsistsOf); + Collection objs = graph.getObjects(project, i.HasImportData); for (Resource o : objs) { if (graph.isInstanceOf(o, i.ImportLibrary)) { @@ -93,23 +83,7 @@ public class ImportNode2 implements INode { } } return nodes; - -// ComosResource c = ComosResource.getInstance(graph); -// Collection models = graph.getObjects(project, b.ConsistsOf); -// Collection comosImports = new ArrayList(); -// for (Resource m : models) { -// Collection objs = graph.getObjects(m, b.ConsistsOf); -// for (Resource o : objs) { -// if (graph.isInstanceOf(o, c.ComosImportLibrary)) { -// String icon_db_path = ComosGraphTools.getIconPath(o, graph); -// if (icon_db_path == null) -// continue; -// ComosIconReader iconReader = new ComosIconReader(icon_db_path); -// comosImports.add(new ComosGraphNode(o, iconReader)); -// } -// } -// } -// return comosImports; + } diff --git a/org.simantics.interop/src/org/simantics/interop/browsing/InteropChildRule.java b/org.simantics.interop/src/org/simantics/interop/browsing/InteropChildRule.java index 3b6d25e..cf889aa 100644 --- a/org.simantics.interop/src/org/simantics/interop/browsing/InteropChildRule.java +++ b/org.simantics.interop/src/org/simantics/interop/browsing/InteropChildRule.java @@ -9,16 +9,15 @@ import org.simantics.browsing.ui.model.children.ChildRule; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.exception.DatabaseException; -import org.simantics.interop.stubs.InteropResource; -import org.simantics.layer0.Layer0; import org.simantics.modeling.ui.modelBrowser.model.INode; +@SuppressWarnings("deprecation") public class InteropChildRule implements ChildRule{ @Override public boolean isCompatible(Class contentType) { return Resource.class.isAssignableFrom(contentType); } - @Override + @Override public Collection getChildren(ReadGraph graph, Object parent_) throws DatabaseException { Resource parent = (Resource)parent_; diff --git a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java index 2ca4391..7e0344b 100644 --- a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java +++ b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor1.java @@ -5,14 +5,13 @@ import java.util.Collection; import org.simantics.browsing.ui.graph.contributor.viewpoint.ViewpointContributor; import org.simantics.db.ReadGraph; -import org.simantics.db.Resource; import org.simantics.db.exception.DatabaseException; import org.simantics.interop.browsing.ImportNode; -import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.ui.modelBrowser.model.INode; import org.simantics.structural.ui.modelBrowser.nodes.ModelNode; +@SuppressWarnings("deprecation") public class Contributor1 extends ViewpointContributor { @@ -23,7 +22,6 @@ public class Contributor1 extends ViewpointContributor { public Collection getContribution(ReadGraph graph, ModelNode input) throws DatabaseException { Collection nodes = new ArrayList(); - System.out.println("Contributor 1 " + input + " " + GraphUtils.getReadableName(graph, input.resource)); nodes.add(new ImportNode(input.resource)); return nodes; } @@ -36,26 +34,4 @@ public class Contributor1 extends ViewpointContributor { } -//public class Contributor1 extends ViewpointContributor { -// -// -// public Contributor1() { -// super(); -// } -// @Override -// public Collection getContribution(ReadGraph graph, Resource input) -// throws DatabaseException { -// Collection nodes = new ArrayList(); -// System.out.println("Contributor 1 " + input + " " + GraphUtils.getReadableName(graph, input)); -// nodes.add(new ImportNode(input)); -// return nodes; -// } -// -// @Override -// public String getViewpointId() { -// return "Standard"; -// } -// -// -// -//} + diff --git a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor2.java b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor2.java index cc9f838..8931554 100644 --- a/org.simantics.interop/src/org/simantics/interop/handlers/Contributor2.java +++ b/org.simantics.interop/src/org/simantics/interop/handlers/Contributor2.java @@ -8,10 +8,10 @@ import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.exception.DatabaseException; import org.simantics.interop.browsing.ImportNode2; -import org.simantics.layer0.utils.direct.GraphUtils; import org.simantics.modeling.ui.modelBrowser.model.INode; +@SuppressWarnings("deprecation") public class Contributor2 extends ViewpointContributor { @@ -22,7 +22,6 @@ public class Contributor2 extends ViewpointContributor { public Collection getContribution(ReadGraph graph, Resource input) throws DatabaseException { Collection nodes = new ArrayList(); - System.out.println("Contributor 2 " + input + " " + GraphUtils.getReadableName(graph, input)); nodes.add(new ImportNode2(input)); return nodes; } diff --git a/org.simantics.interop/src/org/simantics/interop/handlers/EvaluatorFactory1.java b/org.simantics.interop/src/org/simantics/interop/handlers/EvaluatorFactory1.java index 7b26fcc..aa9b72e 100644 --- a/org.simantics.interop/src/org/simantics/interop/handlers/EvaluatorFactory1.java +++ b/org.simantics.interop/src/org/simantics/interop/handlers/EvaluatorFactory1.java @@ -2,19 +2,15 @@ package org.simantics.interop.handlers; import java.util.Collection; -import org.eclipse.jface.resource.JFaceResources; -import org.eclipse.jface.resource.LocalResourceManager; -import org.eclipse.swt.widgets.Display; import org.simantics.browsing.ui.common.EvaluatorData.Evaluator; import org.simantics.browsing.ui.common.extension.EvaluatorFactory; import org.simantics.modeling.ui.modelBrowser.ModelEvaluators; import org.simantics.modeling.ui.modelBrowser.model.INode; -import org.simantics.ui.SimanticsUI; +@SuppressWarnings("deprecation") public class EvaluatorFactory1 implements EvaluatorFactory { public EvaluatorFactory1() { - // TODO Auto-generated constructor stub } @Override diff --git a/org.simantics.interop/src/org/simantics/interop/ui/IssuesViewPart.java b/org.simantics.interop/src/org/simantics/interop/ui/IssuesViewPart.java index d9e7b6d..a481623 100644 --- a/org.simantics.interop/src/org/simantics/interop/ui/IssuesViewPart.java +++ b/org.simantics.interop/src/org/simantics/interop/ui/IssuesViewPart.java @@ -107,6 +107,7 @@ public class IssuesViewPart extends ViewPart { } + @SuppressWarnings("unchecked") @Override public Object[] getElements(Object inputElement) { Collection issues = (Collection)inputElement; diff --git a/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java b/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java index 3dccbd4..e2a338a 100644 --- a/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java +++ b/org.simantics.interop/src/org/simantics/interop/utils/StringColumnComparator.java @@ -28,6 +28,7 @@ public class StringColumnComparator extends ViewerComparator { } } + @SuppressWarnings("unchecked") @Override public int compare(Viewer viewer, Object e1, Object e2) { -- 2.45.2