[kepler-code] r28745 - releases/release-branches/gui-2.3/src/org/kepler/sms/gui

[crawl at ecoinformatics.org]

Author: crawl
Date: 2011-10-03 15:43:40 -0700 (Mon, 03 Oct 2011)
New Revision: 28745

Modified:
   releases/release-branches/gui-2.3/src/org/kepler/sms/gui/SemanticTypeEditor.java
   releases/release-branches/gui-2.3/src/org/kepler/sms/gui/WorkflowTypeCheckerDialog.java
Log:
merge from trunk r28744:

fixing for java 7: java.awt.Window now has an enum called "Type";
subclasses with fields named "Type" need to use fully-qualified names.
see: http://bugs.sun.com/view_bug.do?bug_id=7022069


Modified: releases/release-branches/gui-2.3/src/org/kepler/sms/gui/SemanticTypeEditor.java
===================================================================
--- releases/release-branches/gui-2.3/src/org/kepler/sms/gui/SemanticTypeEditor.java	2011-10-03 22:23:04 UTC (rev 28744)
+++ releases/release-branches/gui-2.3/src/org/kepler/sms/gui/SemanticTypeEditor.java	2011-10-03 22:43:40 UTC (rev 28745)
@@ -233,11 +233,11 @@
 
 			// output port types
 			String[] o1_labels = { "a", "b", "c" };
-			Type[] o1_types = { BaseType.DOUBLE, BaseType.INT, BaseType.STRING };
+			ptolemy.data.type.Type[] o1_types = { BaseType.DOUBLE, BaseType.INT, BaseType.STRING };
 			String[] o2_sublabels = { "c", "d" };
-			Type[] o2_subtypes = { BaseType.STRING, BaseType.INT };
+			ptolemy.data.type.Type[] o2_subtypes = { BaseType.STRING, BaseType.INT };
 			String[] o2_labels = { "a", "b" };
-			Type[] o2_types = { new ArrayType(BaseType.DOUBLE),
+			ptolemy.data.type.Type[] o2_types = { new ArrayType(BaseType.DOUBLE),
 					new RecordType(o2_sublabels, o2_subtypes) };
 
 			// output ports
@@ -307,7 +307,7 @@
 		}
 	}
 
-	public static TypedIOPort addInputType(TypedAtomicActor actor, Type type,
+	public static TypedIOPort addInputType(TypedAtomicActor actor, ptolemy.data.type.Type type,
 			String name) throws NameDuplicationException,
 			IllegalActionException {
 		TypedIOPort p = (TypedIOPort) actor.newPort(name);
@@ -317,7 +317,7 @@
 		return p;
 	}
 
-	public static TypedIOPort addOutputType(TypedAtomicActor actor, Type type,
+	public static TypedIOPort addOutputType(TypedAtomicActor actor, ptolemy.data.type.Type type,
 			String name) throws NameDuplicationException,
 			IllegalActionException {
 		TypedIOPort p = (TypedIOPort) actor.newPort(name);

Modified: releases/release-branches/gui-2.3/src/org/kepler/sms/gui/WorkflowTypeCheckerDialog.java
===================================================================
--- releases/release-branches/gui-2.3/src/org/kepler/sms/gui/WorkflowTypeCheckerDialog.java	2011-10-03 22:23:04 UTC (rev 28744)
+++ releases/release-branches/gui-2.3/src/org/kepler/sms/gui/WorkflowTypeCheckerDialog.java	2011-10-03 22:43:40 UTC (rev 28745)
@@ -587,8 +587,8 @@
 	private boolean _unsafeStructTypes(IOPort output, IOPort input) {
 		if (!(output instanceof TypedIOPort) || !(input instanceof TypedIOPort))
 			return false;
-		Type outType = ((TypedIOPort) output).getType();
-		Type inType = ((TypedIOPort) input).getType();
+		ptolemy.data.type.Type outType = ((TypedIOPort) output).getType();
+		ptolemy.data.type.Type inType = ((TypedIOPort) input).getType();
 
 		if (outType == null || inType == null)
 			return false;
@@ -606,8 +606,8 @@
 		if (!(output instanceof TypedIOPort) || !(input instanceof TypedIOPort))
 			return true;
 
-		Type outType = ((TypedIOPort) output).getType();
-		Type inType = ((TypedIOPort) input).getType();
+		ptolemy.data.type.Type outType = ((TypedIOPort) output).getType();
+		ptolemy.data.type.Type inType = ((TypedIOPort) input).getType();
 
 		if (outType == null || inType == null)
 			return true;