Author: kono
Date: 2012-04-25 18:05:49 -0700 (Wed, 25 Apr 2012)
New Revision: 29011
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/IntegerVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyNumberPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyStringPropertyEditor.java
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
Log:
Correct generics parameter to accept only graph objects.
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/ArrowShapeVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -4,6 +4,7 @@
import java.util.HashSet;
import java.util.Map;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
@@ -61,7 +62,7 @@
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
public ArrowShapeVisualProperty(ArrowShape defaultValue, String id,
String displayName,
- Class<?> modelDataType) {
+ Class<? extends CyIdentifiable> modelDataType) {
super(defaultValue, ARROW_SHAPE_RANGE, id, displayName,
modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/BooleanVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -38,6 +38,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
@@ -65,7 +66,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public BooleanVisualProperty(final Boolean def, final String id, final
String displayName, final Class<?> modelDataType) {
+ public BooleanVisualProperty(final Boolean def, final String id, final
String displayName, final Class<? extends CyIdentifiable> modelDataType) {
this(def, id, displayName, false, modelDataType);
}
@@ -77,7 +78,7 @@
* @param ignoreDefault Whether the default value should be ignored.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public BooleanVisualProperty(final Boolean def, final String id, final
String displayName, final Boolean ignoreDefault, final Class<?> modelDataType) {
+ public BooleanVisualProperty(final Boolean def, final String id, final
String displayName, final Boolean ignoreDefault, final Class<? extends
CyIdentifiable> modelDataType) {
super(def, BOOLEAN_RANGE, id, displayName, modelDataType);
this.shouldIgnoreDefault = ignoreDefault;
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DefaultVisualizableVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
@@ -33,7 +34,7 @@
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
public DefaultVisualizableVisualProperty(final String id,
- final String displayName, final Class<?> modelDataType)
{
+ final String displayName, final Class<? extends
CyIdentifiable> modelDataType) {
super(visualizable, VISUALIZABLE_RANGE, id, displayName,
modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/DoubleVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -34,6 +34,7 @@
*/
package org.cytoscape.view.presentation.property;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.Range;
@@ -52,7 +53,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public DoubleVisualProperty(final Double def, final Range<Double>
range, final String id, final String displayName, final Class<?> modelDataType)
{
+ public DoubleVisualProperty(final Double def, final Range<Double>
range, final String id, final String displayName, final Class<? extends
CyIdentifiable> modelDataType) {
this(def, range, id, displayName, false, modelDataType);
}
@@ -66,7 +67,7 @@
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
public DoubleVisualProperty(final Double def, final Range<Double>
range, final String id,
- final String displayName, final boolean ignoreDefault,
final Class<?> modelDataType) {
+ final String displayName, final boolean ignoreDefault,
final Class<? extends CyIdentifiable> modelDataType) {
super(def, range, id, displayName, modelDataType);
this.shouldIgnoreDefault = ignoreDefault;
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/FontVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -39,6 +39,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.Range;
@@ -82,7 +83,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public FontVisualProperty(final Font def, final String id, final String
displayName, final Class<?> modelDataType) {
+ public FontVisualProperty(final Font def, final String id, final String
displayName, final Class<? extends CyIdentifiable> modelDataType) {
super(def, FONT_RANGE, id, displayName, modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/IntegerVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/IntegerVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/IntegerVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -34,6 +34,7 @@
*/
package org.cytoscape.view.presentation.property;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.Range;
@@ -52,7 +53,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public IntegerVisualProperty(final Integer def, final Range<Integer>
range, final String id, final String displayName, final Class<?> modelDataType)
{
+ public IntegerVisualProperty(final Integer def, final Range<Integer>
range, final String id, final String displayName, final Class<? extends
CyIdentifiable> modelDataType) {
super(def, range, id, displayName, modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/LineTypeVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -4,6 +4,7 @@
import java.util.HashSet;
import java.util.Map;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
@@ -52,7 +53,7 @@
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
public LineTypeVisualProperty(LineType defaultValue,
- String id, String displayName, Class<?> modelDataType) {
+ String id, String displayName, Class<? extends
CyIdentifiable> modelDataType) {
super(defaultValue, LINE_TYPE_RANGE, id, displayName,
modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NodeShapeVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -4,6 +4,7 @@
import java.util.HashSet;
import java.util.Map;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import
org.cytoscape.view.presentation.property.values.AbstractVisualPropertyValue;
@@ -71,7 +72,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public NodeShapeVisualProperty(NodeShape defaultValue, String id,
String displayName, Class<?> modelDataType) {
+ public NodeShapeVisualProperty(NodeShape defaultValue, String id,
String displayName, Class<? extends CyIdentifiable> modelDataType) {
super(defaultValue, NODE_SHAPE_RANGE, id, displayName,
modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/NullVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.DiscreteRange;
import org.cytoscape.view.model.NullDataType;
@@ -31,7 +32,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
*/
public NullVisualProperty(final String id, final String displayName) {
- super(dummyObject, NULL_RANGE, id, displayName, Object.class);
+ super(dummyObject, NULL_RANGE, id, displayName,
CyIdentifiable.class);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/PaintVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -39,6 +39,7 @@
import java.awt.Paint;
import java.util.StringTokenizer;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.Range;
@@ -57,7 +58,7 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public PaintVisualProperty(final Paint def, final Range<Paint> range,
final String id, final String displayName, final Class<?> modelDataType) {
+ public PaintVisualProperty(final Paint def, final Range<Paint> range,
final String id, final String displayName, final Class<? extends
CyIdentifiable> modelDataType) {
super(def, range, id, displayName, modelDataType);
}
Modified:
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
===================================================================
---
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/presentation-api/src/main/java/org/cytoscape/view/presentation/property/StringVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -34,6 +34,7 @@
*/
package org.cytoscape.view.presentation.property;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.Range;
@@ -52,11 +53,8 @@
* @param displayName A human readable string used for displays and
user interfaces.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public StringVisualProperty(final String def,
- final
Range<String> range,
- final String id,
- final String
displayName,
- final Class<?>
modelDataType) {
+ public StringVisualProperty(final String def, final Range<String>
range, final String id, final String displayName,
+ final Class<? extends CyIdentifiable> modelDataType) {
super(def, range, id, displayName, modelDataType);
}
@@ -69,12 +67,8 @@
* @param ignoreDefault Whether the default value should be ignored or
not.
* @param modelDataType The model data type associated with this visual
property, e.g. CyNode, CyEdge, or CyNetwork.
*/
- public StringVisualProperty(final String def,
- final
Range<String> range,
- final String id,
- final String
displayName,
- final boolean
ignoreDefault,
- final Class<?>
modelDataType) {
+ public StringVisualProperty(final String def, final Range<String>
range, final String id, final String displayName,
+ final boolean ignoreDefault, final Class<? extends
CyIdentifiable> modelDataType) {
super(def, range, id, displayName, modelDataType);
this.shouldIgnoreDefault = ignoreDefault;
}
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/AbstractVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -34,7 +34,9 @@
*/
package org.cytoscape.view.model;
+import org.cytoscape.model.CyIdentifiable;
+
/**
* An abstract implementation of VisualProperty that omits the methods dealing
* with serializing data.
@@ -57,7 +59,7 @@
/** If this is true, default value will be ignored by VizMapper. */
protected boolean shouldIgnoreDefault;
- private final Class<?> targetObjectDataType;
+ private final Class<? extends CyIdentifiable> targetObjectDataType;
/**
@@ -70,19 +72,19 @@
* @param targetObjectDataType the type of the target object for this
visual property.
*
*/
- @SuppressWarnings("unchecked")
- public AbstractVisualProperty(final T defaultValue, final Range<T>
range, final String id, final String displayName, final Class<?>
targetObjectDataType) {
- if(defaultValue == null)
+ public AbstractVisualProperty(final T defaultValue, final Range<T>
range, final String id,
+ final String displayName, final Class<? extends
CyIdentifiable> targetObjectDataType) {
+ if (defaultValue == null)
throw new NullPointerException("defaultValue should not
be null.");
-
- if(id == null)
+
+ if (id == null)
throw new NullPointerException("id should not be
null.");
-
- if(displayName == null)
+
+ if (displayName == null)
throw new NullPointerException("displayName should not
be null.");
-
+
this.range = range;
-
+
this.defaultValue = defaultValue;
this.id = id;
this.name = displayName;
@@ -117,7 +119,7 @@
return this.shouldIgnoreDefault;
}
- @Override public Class<?> getTargetDataType() {
+ @Override public Class<? extends CyIdentifiable> getTargetDataType() {
return this.targetObjectDataType;
}
Modified:
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
===================================================================
---
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/api/trunk/viewmodel-api/src/main/java/org/cytoscape/view/model/VisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -34,8 +34,10 @@
*/
package org.cytoscape.view.model;
+import org.cytoscape.model.CyIdentifiable;
+
/**
* An object which represents a type of visual entity, such as node color,
size, etc.
*
@@ -113,6 +115,6 @@
* @return target data type of this visual property. CyNode, CyEdge,
or CyNetwork.
*
*/
- Class<?> getTargetDataType();
+ Class<? extends CyIdentifiable> getTargetDataType();
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/CustomGraphicsVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -5,12 +5,13 @@
import org.cytoscape.ding.customgraphics.CyCustomGraphics;
import org.cytoscape.ding.customgraphics.NullCustomGraphics;
import org.cytoscape.graph.render.stateful.CustomGraphic;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
public class CustomGraphicsVisualProperty extends
AbstractVisualProperty<CyCustomGraphics> {
public CustomGraphicsVisualProperty(final
CyCustomGraphics<CustomGraphic> defaultValue,
- final CustomGraphicsRange customGraphicsRange, String
id, String displayName, Class<?> targetObjectDataType) {
+ final CustomGraphicsRange customGraphicsRange, String
id, String displayName, Class<? extends CyIdentifiable> targetObjectDataType) {
super(defaultValue, customGraphicsRange, id, displayName,
targetObjectDataType);
}
Modified:
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
===================================================================
---
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/impl/trunk/ding-impl/ding-presentation-impl/src/main/java/org/cytoscape/ding/impl/visualproperty/ObjectPositionVisualProperty.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -2,6 +2,7 @@
import org.cytoscape.ding.ObjectPosition;
import org.cytoscape.ding.impl.ObjectPositionImpl;
+import org.cytoscape.model.CyIdentifiable;
import org.cytoscape.view.model.AbstractVisualProperty;
import org.cytoscape.view.model.ContinuousRange;
import org.cytoscape.view.model.Range;
@@ -18,7 +19,7 @@
public ObjectPositionVisualProperty(ObjectPosition defaultValue,
String id, String displayName,
- Class<?> targetObjectDataType) {
+ Class<? extends CyIdentifiable> targetObjectDataType) {
super(defaultValue, OBJECT_POSITION_RANGE, id, displayName,
targetObjectDataType);
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyNumberPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyNumberPropertyEditor.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyNumberPropertyEditor.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -67,11 +67,10 @@
((JTextField) editor).addFocusListener(new FocusListener() {
public void focusGained(FocusEvent e) {
-
- logger.debug("Number Editor got val: " +
currentValue);
-
- final Item item = (Item)
panel.getSelectedItem();
- selected = item.getProperty().getDisplayName();
+ if (panel != null) {
+ final Item item = (Item)
panel.getSelectedItem();
+ selected =
item.getProperty().getDisplayName();
+ }
setCurrentValue();
}
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyStringPropertyEditor.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyStringPropertyEditor.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/editor/propertyeditor/CyStringPropertyEditor.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -62,6 +62,8 @@
Method getM = null;
Object val = null;
+ //System.out.println("* String E Called!");
+
try {
getM =
e.getOppositeComponent().getClass().getMethod("getSelectedRow", new Class[] {});
} catch (SecurityException e1) {
Modified:
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
===================================================================
---
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2012-04-26 00:25:03 UTC (rev 29010)
+++
core3/impl/trunk/vizmap-gui-impl/src/main/java/org/cytoscape/view/vizmap/gui/internal/event/CellEditorEventHandler.java
2012-04-26 01:05:49 UTC (rev 29011)
@@ -69,40 +69,32 @@
*/
public class CellEditorEventHandler implements VizMapEventHandler {
- private static final Logger logger = LoggerFactory
- .getLogger(CellEditorEventHandler.class);
+ private static final Logger logger =
LoggerFactory.getLogger(CellEditorEventHandler.class);
- private final SelectedVisualStyleManager manager;
-
- // Keeps current discrete mappings. NOT PERMANENT
- private final Map<String, Map<Object, Object>> discMapBuffer;
-
+ private final SelectedVisualStyleManager selectedStyleManager;
private final CyNetworkTableManager tableMgr;
protected final VizMapPropertySheetBuilder vizMapPropertySheetBuilder;
protected final PropertySheetPanel propertySheetPanel;
protected final CyApplicationManager applicationManager;
-
+
private final AttributeSetManager attrManager;
-
+
private final VizMapperUtil util;
-
/**
* Creates a new CellEditorEventHandler object.
*/
public CellEditorEventHandler(final SelectedVisualStyleManager manager,
- final PropertySheetPanel propertySheetPanel,
- final CyNetworkTableManager tableMgr,
- final CyApplicationManager applicationManager,
- final VizMapPropertySheetBuilder
vizMapPropertySheetBuilder, final AttributeSetManager attrManager, final
VizMapperUtil util) {
-
- discMapBuffer = new HashMap<String, Map<Object, Object>>();
+ final PropertySheetPanel propertySheetPanel, final
CyNetworkTableManager tableMgr,
+ final CyApplicationManager applicationManager, final
VizMapPropertySheetBuilder vizMapPropertySheetBuilder,
+ final AttributeSetManager attrManager, final
VizMapperUtil util) {
+
this.propertySheetPanel = propertySheetPanel;
this.tableMgr = tableMgr;
this.applicationManager = applicationManager;
this.vizMapPropertySheetBuilder = vizMapPropertySheetBuilder;
- this.manager = manager;
+ this.selectedStyleManager = manager;
this.attrManager = attrManager;
this.util = util;
}
@@ -151,8 +143,7 @@
// Extract selected Property object in the table.
final Item selectedItem = (Item)
propertySheetPanel.getTable().getValueAt(selected, 0);
- final VizMapperProperty<?, ?, ?> prop = (VizMapperProperty<?,
?, ?>) selectedItem
- .getProperty();
+ final VizMapperProperty<?, ?, ?> prop = (VizMapperProperty<?,
?, ?>) selectedItem.getProperty();
logger.debug("#### Got new PROP: Name = " +
prop.getDisplayName());
logger.debug("#### Got new PROP: new Value = " + newVal);
@@ -162,11 +153,9 @@
// Case 1: Attribute type changed.
if (prop.getCellType().equals(CellType.VISUAL_PROPERTY_TYPE)) {
if (e.getNewValue() == null)
- throw new NullPointerException(
- "New controlling attr name is
null.");
+ throw new NullPointerException("New controlling
attr name is null.");
- VisualMappingFunctionFactory factory =
(VisualMappingFunctionFactory) prop
- .getInternalValue();
+ VisualMappingFunctionFactory factory =
(VisualMappingFunctionFactory) prop.getInternalValue();
if (factory == null) {
logger.debug("## Factory is still null.");
@@ -175,8 +164,7 @@
final VizMapperProperty<?, ?, ?> child
= (VizMapperProperty<?, ?, ?>) children[i];
if
(child.getCellType().equals(CellType.MAPPING_TYPE)
&& child.getValue()
instanceof VisualMappingFunctionFactory) {
- factory =
(VisualMappingFunctionFactory) child
- .getValue();
+ factory =
(VisualMappingFunctionFactory) child.getValue();
break;
}
}
@@ -184,10 +172,8 @@
return;
}
- final AttributeComboBoxPropertyEditor editor =
(AttributeComboBoxPropertyEditor) e
- .getSource();
- switchControllingAttr(factory, editor, prop,
e.getNewValue()
- .toString());
+ final AttributeComboBoxPropertyEditor editor =
(AttributeComboBoxPropertyEditor) e.getSource();
+ switchControllingAttr(factory, editor, prop,
e.getNewValue().toString());
}
// 2. Switch mapping type
@@ -197,8 +183,7 @@
return;
// Parent is always root.
- VizMapperProperty<?, ?, ?> parent =
(VizMapperProperty<?, ?, ?>) prop
- .getParentProperty();
+ VizMapperProperty<?, ?, ?> parent =
(VizMapperProperty<?, ?, ?>) prop.getParentProperty();
type = (VisualProperty<?>) parent.getKey();
Object controllingAttrName = parent.getValue();
@@ -207,7 +192,7 @@
logger.debug("New Type = " + type.getDisplayName());
logger.debug("New Attr Name = " + controllingAttrName);
-
+
switchMappingType(prop, type,
(VisualMappingFunctionFactory) e.getNewValue(),
controllingAttrName.toString());
} else if (prop.getParentProperty() != null) {
@@ -216,43 +201,38 @@
logger.debug("Cell edit event: old val = " +
prop.getValue());
logger.debug("Cell edit event: new val = " + newVal);
logger.debug("Cell edit event: associated mapping = " +
prop.getInternalValue());
-
+
final VisualMappingFunction<?, ?> mapping =
(VisualMappingFunction<?, ?>) prop.getInternalValue();
-
- if(mapping == null)
+
+ if (mapping == null)
return;
-
- if(mapping instanceof DiscreteMapping) {
- DiscreteMapping<Object, Object> discMap =
(DiscreteMapping<Object, Object>) mapping;
+
+ if (mapping instanceof DiscreteMapping) {
+ DiscreteMapping<Object, Object> discMap =
(DiscreteMapping<Object, Object>) mapping;
discMap.putMapValue(prop.getKey(), newVal);
}
-
-
manager.getCurrentVisualStyle().apply(applicationManager.getCurrentNetworkView());
+
+
selectedStyleManager.getCurrentVisualStyle().apply(applicationManager.getCurrentNetworkView());
applicationManager.getCurrentNetworkView().updateView();
}
}
- private <K, V> void switchControllingAttr(
- final VisualMappingFunctionFactory factory,
- final AttributeComboBoxPropertyEditor editor,
- VizMapperProperty<K, V, ?> prop, final String
ctrAttrName)
- {
- final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
+ private <K, V> void switchControllingAttr(final
VisualMappingFunctionFactory factory,
+ final AttributeComboBoxPropertyEditor editor,
VizMapperProperty<K, V, ?> prop, final String ctrAttrName) {
+ final VisualStyle currentStyle =
selectedStyleManager.getCurrentVisualStyle();
final VisualProperty<V> vp = (VisualProperty<V>) prop.getKey();
- VisualMappingFunction<K, V> mapping = (VisualMappingFunction<K,
V>) currentStyle
- .getVisualMappingFunction(vp);
+ VisualMappingFunction<K, V> mapping = (VisualMappingFunction<K,
V>) currentStyle.getVisualMappingFunction(vp);
- logger.debug("!!!!!!! Got Mapping: " + mapping);
-
/*
* Ignore if not compatible.
*/
@SuppressWarnings("unchecked")
Class<? extends CyIdentifiable> type = (Class<? extends
CyIdentifiable>) editor.getTargetObjectType();
- final CyTable attrForTest =
tableMgr.getTable(applicationManager.getCurrentNetwork(), type,
CyNetwork.DEFAULT_ATTRS);
+ final CyTable attrForTest =
tableMgr.getTable(applicationManager.getCurrentNetwork(), type,
+ CyNetwork.DEFAULT_ATTRS);
- final Class<K> dataType =
(Class<K>)attrForTest.getColumn(ctrAttrName).getType();
+ final Class<K> dataType = (Class<K>)
attrForTest.getColumn(ctrAttrName).getType();
if (mapping == null) {
// Need to create new one
@@ -261,26 +241,22 @@
if (factory == null)
return;
- mapping =
factory.createVisualMappingFunction(ctrAttrName,
- dataType,attrForTest, vp);
+ mapping =
factory.createVisualMappingFunction(ctrAttrName, dataType, attrForTest, vp);
currentStyle.addVisualMappingFunction(mapping);
}
// If same, do nothing.
if (ctrAttrName.equals(mapping.getMappingColumnName())) {
- logger.debug("Same controlling attr. Do nothing for: "
- + ctrAttrName);
+ logger.debug("Same controlling attr. Do nothing for: "
+ ctrAttrName);
return;
}
VisualMappingFunction<K, V> newMapping = null;
if (mapping instanceof PassthroughMapping) {
// Create new Passthrough mapping and register to
current style.
- newMapping =
factory.createVisualMappingFunction(ctrAttrName,
- dataType, attrForTest, vp);
+ newMapping =
factory.createVisualMappingFunction(ctrAttrName, dataType, attrForTest, vp);
currentStyle.addVisualMappingFunction(newMapping);
- logger.debug("Changed to new Map from "
- + mapping.getMappingColumnName() + " to
"
+ logger.debug("Changed to new Map from " +
mapping.getMappingColumnName() + " to "
+ newMapping.getMappingColumnName());
} else if (mapping instanceof ContinuousMapping) {
if ((dataType == Double.class) || (dataType ==
Integer.class)) {
@@ -303,14 +279,13 @@
propertySheetPanel.removeProperty(prop);
// Create new one.
- logger.warn("Creating new prop sheet objects for "
- + newMapping.getMappingColumnName() + ", "
+ logger.warn("Creating new prop sheet objects for " +
newMapping.getMappingColumnName() + ", "
+ vp.getDisplayName());
- final VisualProperty<Visualizable> category =
util.getCategory((Class<? extends CyIdentifiable>) vp.getTargetDataType());
- VizMapperProperty<VisualProperty<V>, String, ?> newRootProp =
vizMapPropertySheetBuilder
- .getPropertyBuilder().buildProperty(newMapping,
- category.getDisplayName(),
propertySheetPanel, factory);
+ final VisualProperty<Visualizable> category =
util.getCategory((Class<? extends CyIdentifiable>) vp
+ .getTargetDataType());
+ VizMapperProperty<VisualProperty<V>, String, ?> newRootProp =
vizMapPropertySheetBuilder.getPropertyBuilder()
+ .buildProperty(newMapping,
category.getDisplayName(), propertySheetPanel, factory);
vizMapPropertySheetBuilder.removeProperty(prop, currentStyle);
@@ -333,22 +308,22 @@
final VisualMappingFunctionFactory factory, final
String controllingAttrName) {
// This is the currently selected Visual Style.
- final VisualStyle style = manager.getCurrentVisualStyle();
-
+ final VisualStyle style =
selectedStyleManager.getCurrentVisualStyle();
+
final VisualProperty<Visualizable> startVP =
util.getCategory((Class<? extends CyIdentifiable>) vp.getTargetDataType());
final VisualMappingFunction<?, ?> currentMapping =
style.getVisualMappingFunction(vp);
-
+
logger.debug("Current Mapping for " + vp.getDisplayName() + "
is: " + currentMapping);
-
+
final VisualMappingFunction<?, ?> newMapping;
logger.debug("!! New factory Category: " +
factory.getMappingFunctionType());
logger.debug("!! Current Mapping type: " + currentMapping);
-
- if(currentMapping == null || currentMapping.getClass() !=
factory.getMappingFunctionType()) {
-
+
+ if (currentMapping == null || currentMapping.getClass() !=
factory.getMappingFunctionType()) {
+
// Mapping does not exist. Need to create new one.
final AttributeSet attrSet =
attrManager.getAttributeSet(applicationManager.getCurrentNetwork(),
- (Class<? extends CyIdentifiable>)
vp.getTargetDataType());
+ vp.getTargetDataType());
final Class<?> attributeDataType =
attrSet.getAttrMap().get(controllingAttrName);
if (factory.getMappingFunctionType() ==
ContinuousMapping.class) {
@@ -359,8 +334,8 @@
return;
}
}
-
- newMapping =
factory.createVisualMappingFunction(controllingAttrName, attributeDataType,
null,vp);
+
+ newMapping =
factory.createVisualMappingFunction(controllingAttrName, attributeDataType,
null, vp);
style.addVisualMappingFunction(newMapping);
} else
newMapping = currentMapping;
@@ -386,7 +361,7 @@
propList.add(newRootProp);
parent = null;
- final VisualStyle currentStyle =
manager.getCurrentVisualStyle();
+ final VisualStyle currentStyle =
selectedStyleManager.getCurrentVisualStyle();
currentStyle.apply(applicationManager.getCurrentNetworkView());
applicationManager.getCurrentNetworkView().updateView();
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
