Author: clopes
Date: 2012-08-28 08:43:22 -0700 (Tue, 28 Aug 2012)
New Revision: 30281
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/SUIDUpdater.java
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializerTest.java
Log:
Just deleted unnecessary code (see rejected bug #1375)
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
2012-08-27 22:27:20 UTC (rev 30280)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/CyActivator.java
2012-08-28 15:43:22 UTC (rev 30281)
@@ -210,7 +210,7 @@
CysessionReaderFactory cysessionReaderFactory = new
CysessionReaderFactory(cysessionFilter);
BookmarkReaderFactory bookmarkReaderFactory = new
BookmarkReaderFactory(bookmarksFilter);
PropertiesReaderFactory propertiesReaderFactory = new
PropertiesReaderFactory(propertiesFilter);
- VisualStyleSerializer visualStyleSerializer = new
VisualStyleSerializer(calculatorConverterFactory,visualStyleFactoryServiceRef,visualMappingManagerServiceRef,renderingEngineManagerServiceRef,discreteMappingFactoryServiceRef,continuousMappingFactoryServiceRef,passthroughMappingFactoryServiceRef,suidUpdater);
+ VisualStyleSerializer visualStyleSerializer = new
VisualStyleSerializer(calculatorConverterFactory,visualStyleFactoryServiceRef,visualMappingManagerServiceRef,renderingEngineManagerServiceRef,discreteMappingFactoryServiceRef,continuousMappingFactoryServiceRef,passthroughMappingFactoryServiceRef);
VizmapXMLReaderFactory vizmapXMLReaderFactory = new
VizmapXMLReaderFactory(vizmapXMLFilter,visualStyleSerializer);
VizmapPropertiesReaderFactory vizmapPropertiesReaderFactory =
new VizmapPropertiesReaderFactory(vizmapPropertiesFilter,visualStyleSerializer);
BitmapWriterFactory pngWriterFactory = new
BitmapWriterFactory(pngFilter);
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/SUIDUpdater.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/SUIDUpdater.java
2012-08-27 22:27:20 UTC (rev 30280)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/SUIDUpdater.java
2012-08-28 15:43:22 UTC (rev 30281)
@@ -8,9 +8,6 @@
import java.util.Map;
import java.util.Set;
-import org.cytoscape.io.internal.util.vizmap.model.AttributeType;
-import org.cytoscape.io.internal.util.vizmap.model.DiscreteMapping;
-import org.cytoscape.io.internal.util.vizmap.model.DiscreteMappingEntry;
import org.cytoscape.model.CyColumn;
import org.cytoscape.model.CyRow;
import org.cytoscape.model.CyTable;
@@ -83,26 +80,6 @@
}
}
- public void update(final DiscreteMapping dm) {
- if (isUpdatable(dm)) {
- final List<DiscreteMappingEntry> invalidEntries = new
ArrayList<DiscreteMappingEntry>();
-
- for (final DiscreteMappingEntry entry :
dm.getDiscreteMappingEntry()) {
- final String attrVal =
entry.getAttributeValue();
- // TODO handle list of SUIDs
- final Long oldSUID = attrVal != null ?
Long.parseLong(attrVal) : null;
- final Long newSUID = getNewSUID(oldSUID);
-
- if (newSUID != null)
-
entry.setAttributeValue(newSUID.toString());
- else
- invalidEntries.add(entry);
- }
-
- dm.getDiscreteMappingEntry().removeAll(invalidEntries);
- }
- }
-
public static boolean isUpdatable(final CyColumn column) {
if (column != null
&& !column.isPrimaryKey()
@@ -115,14 +92,6 @@
return false;
}
- public static boolean isUpdatable(final DiscreteMapping dm) {
- if (dm != null
- && (dm.getAttributeType() == AttributeType.LONG
|| dm.getAttributeType() == AttributeType.LIST))
- return isUpdatable(dm.getAttributeName());
-
- return false;
- }
-
public static boolean isUpdatable(final String columnName) {
return columnName != null &&
columnName.endsWith(SUID_COLUMN_SUFFIX);
}
Modified:
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2012-08-27 22:27:20 UTC (rev 30280)
+++
core3/impl/trunk/io-impl/impl/src/main/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializer.java
2012-08-28 15:43:22 UTC (rev 30281)
@@ -45,7 +45,6 @@
import java.util.Properties;
import java.util.Set;
-import org.cytoscape.io.internal.util.SUIDUpdater;
import org.cytoscape.io.internal.util.vizmap.model.AttributeType;
import org.cytoscape.io.internal.util.vizmap.model.Dependency;
import org.cytoscape.io.internal.util.vizmap.model.DiscreteMappingEntry;
@@ -89,7 +88,6 @@
private final VisualMappingFunctionFactory discreteMappingFactory;
private final VisualMappingFunctionFactory continuousMappingFactory;
private final VisualMappingFunctionFactory passthroughMappingFactory;
- private final SUIDUpdater suidUpdater;
private VisualLexicon lexicon;
@@ -101,8 +99,7 @@
final
RenderingEngineManager renderingEngineManager,
final
VisualMappingFunctionFactory discreteMappingFactory,
final
VisualMappingFunctionFactory continuousMappingFactory,
- final
VisualMappingFunctionFactory passthroughMappingFactory,
- final
SUIDUpdater suidUpdater) {
+ final
VisualMappingFunctionFactory passthroughMappingFactory) {
this.calculatorConverterFactory = calculatorConverterFactory;
this.visualStyleFactory = visualStyleFactory;
this.visualMappingManager = visualMappingManager;
@@ -110,7 +107,6 @@
this.discreteMappingFactory = discreteMappingFactory;
this.continuousMappingFactory = continuousMappingFactory;
this.passthroughMappingFactory = passthroughMappingFactory;
- this.suidUpdater = suidUpdater;
}
/**
@@ -421,9 +417,6 @@
String attrName =
dmModel.getAttributeName();
AttributeType attrType =
dmModel.getAttributeType();
- // If it's maps to an SUID-type column,
the old SUID values must be updated first
- suidUpdater.update(dmModel);
-
try {
Class<?> attrClass = null;
Modified:
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializerTest.java
===================================================================
---
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializerTest.java
2012-08-27 22:27:20 UTC (rev 30280)
+++
core3/impl/trunk/io-impl/impl/src/test/java/org/cytoscape/io/internal/util/vizmap/VisualStyleSerializerTest.java
2012-08-28 15:43:22 UTC (rev 30281)
@@ -1,6 +1,6 @@
package org.cytoscape.io.internal.util.vizmap;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
@@ -13,7 +13,6 @@
import java.util.Map;
import java.util.Properties;
-import org.cytoscape.io.internal.util.SUIDUpdater;
import org.cytoscape.io.internal.util.vizmap.model.Vizmap;
import org.cytoscape.view.model.VisualProperty;
import org.cytoscape.view.presentation.RenderingEngineManager;
@@ -33,13 +32,11 @@
private VisualStyleSerializer serializer;
private Map<VisualStyle, String> styleNames;
private Map<VisualStyle, Map<VisualProperty<?>, ?>> styleProperties;
- private SUIDUpdater suidUpdater;
@Before
public void setUp() throws Exception {
styleNames = new Hashtable<VisualStyle, String>();
styleProperties = new Hashtable<VisualStyle,
Map<VisualProperty<?>, ? extends Object>>();
- suidUpdater = new SUIDUpdater();
final VisualMappingManager visualMappingManager =
mock(VisualMappingManager.class);
final VisualMappingFunctionFactory discreteMappingFactory =
mock(VisualMappingFunctionFactory.class);
@@ -64,8 +61,7 @@
final CalculatorConverterFactory calcFactory = new
CalculatorConverterFactory();
serializer = new VisualStyleSerializer(calcFactory,
visualStyleFactory, visualMappingManager,
- renderingEngineManager, discreteMappingFactory,
continuousMappingFactory, passthroughMappingFactory,
- suidUpdater);
+ renderingEngineManager, discreteMappingFactory,
continuousMappingFactory, passthroughMappingFactory);
}
@Test
--
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.
