Author: jgao
Date: 2008-09-15 17:35:01 -0700 (Mon, 15 Sep 2008)
New Revision: 14914
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/NetworkMerge.jar
csplugins/trunk/soc/jgao/NetworkMerge/plugin.props
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/IDMapperText.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/AttributeBasedIDMappingDataImpl.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/IDMappingDataImpl.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/reader/IDMappingTableReader.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDMappingPreviewDialog.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDTypeSelectionTable.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/ReadIDMappingFileTask.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/AttributeConflictCollectorImpl.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/DefaultAttributeConflictHandler.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/IDMappingAttributeConflictHandler.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/AttributeMappingImpl.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/MatchingAttributeImpl.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/ComboBoxTableCellRenderer.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MatchNodeTable.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MergeAttributeTable.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/NetworkMergeFrame.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/CopyingAttributeValueVisitor.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeMerger.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeValueMatcher.java
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/IDMappingAttributeValueMatcher.java
Log:
fix JDK1.5 @Override problem
Modified: csplugins/trunk/soc/jgao/NetworkMerge/NetworkMerge.jar
===================================================================
(Binary files differ)
Modified: csplugins/trunk/soc/jgao/NetworkMerge/plugin.props
===================================================================
--- csplugins/trunk/soc/jgao/NetworkMerge/plugin.props 2008-09-16 00:08:00 UTC
(rev 14913)
+++ csplugins/trunk/soc/jgao/NetworkMerge/plugin.props 2008-09-16 00:35:01 UTC
(rev 14914)
@@ -31,7 +31,7 @@
pluginAuthorsIntsitutions=Jianjiong Gao : U. Missouri ; Keiichiro Ono : UCSD
# Date this plugin/plugin version was released
-releaseDate=Sep 15, 2008
+releaseDate=September 15, 2008
# If this plugin is never meant to be downloaded except as part of a plugin
(not common) add this property. Default is "no"
themeOnly=no
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/IDMapperText.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/IDMapperText.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/IDMapperText.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -65,7 +65,7 @@
* Read ID Mapping from file
*
*/
- @Override
+ //@Override
public void readIDMapping() throws IOException {
IDMappingTableReader reader = new IDMappingTableReader(url);
reader.readTable();
@@ -87,7 +87,7 @@
*
* @throws NullPointerException if ids or srcType or tgtType is null
*/
- @Override
+ //@Override
public Map<String, Set<String>> mapID(final Set<String> ids,
final String srcType,
final String tgtType) {
@@ -110,7 +110,7 @@
* @return
* true if exists, false otherwise
*/
- @Override
+ //@Override
public boolean idExistsInSrcIDType(final String srcID, final String
srcType) {
return idMappingList.getIDMapping(srcType, srcID)!=null;
}
@@ -119,7 +119,7 @@
* @return supported source ID types
*
*/
- @Override
+ //@Override
public Set<String> getSupportedSrcIDTypes() {
if (idMappingList==null) {
// TODO return null or empty Set?
@@ -133,7 +133,7 @@
* @return supported target ID types
*
*/
- @Override
+ //@Override
public Set<String> getSupportedTgtIDTypes() {
if (idMappingList==null) {
// TODO return null or empty Set?
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/AttributeBasedIDMappingDataImpl.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/AttributeBasedIDMappingDataImpl.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/AttributeBasedIDMappingDataImpl.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -59,7 +59,7 @@
idTypes = new HashSet<String>();
}
- @Override
+ //@Override
public boolean isEmpty() {
return mapGOAttrSrcType.isEmpty();
}
@@ -68,7 +68,7 @@
*
* @return id type set of all data
*/
- @Override
+ //@Override
public Set<String> getIDTypes() {
return idTypes;
}
@@ -76,7 +76,7 @@
/**
* remove all data
*/
- @Override
+ //@Override
public void clear() {
mapGOAttrSrcType.clear();
//mapGOAttrSrcID.clear();
@@ -88,7 +88,7 @@
*
* @return map of nodes/edges to attributes
*/
- @Override
+ //@Override
public Map<String,Set<String>> getMapGOAttrs() {
Map<String,Set<String>> mapGOAttrs = new
HashMap<String,Set<String>>();
@@ -114,7 +114,7 @@
*
* @throws NullPointerException if id or attrName is null
*/
- @Override
+ //@Override
public String getSrcIDType(final String id, final String attrName) {
if (id==null || attrName==null) {
throw new java.lang.NullPointerException();
@@ -142,7 +142,7 @@
*
* @throws NullPointerException if id or attrName is null
*/
- @Override
+ //@Override
public Set<String> getSrcIDs(final String id, final String attrName) {
if (id==null || attrName==null) {
throw new java.lang.NullPointerException();
@@ -176,7 +176,7 @@
*
* @throws NullPointerException if id or attrName or tgtType is null
*/
- @Override
+ //@Override
public Set<String> getTgtIDs(final String id, String attrName, final
String tgtType) {
if (id==null || attrName==null || tgtType==null) {
throw new java.lang.NullPointerException();
@@ -209,7 +209,7 @@
*
* @throws NullPointerException if id or attrName or tgtType is null
*/
- @Override
+ //@Override
public Map<String,Set<String>> getMapTgtTypeIDs(String id, String
attrName) {
if (id==null || attrName==null) {
throw new java.lang.NullPointerException();
@@ -236,7 +236,7 @@
* @param tgtIDs
* Set of target IDs
*/
- @Override
+ //@Override
public void addIDMapping(final String idGO,
final String attrName,
final String srcIDType,
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/IDMappingDataImpl.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/IDMappingDataImpl.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/model/IDMappingDataImpl.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -70,7 +70,7 @@
* @return
* the set of supported ID types
*/
- @Override
+ //@Override
public Set<String> getIDTypes() {
return mapTypeIDMapTypeIDs.keySet();
}
@@ -86,7 +86,7 @@
*
* @throws NullPointerException if type is null
*/
- @Override
+ //@Override
public boolean isIDTypeContained(final String type) {
if (type==null) {
throw new java.lang.NullPointerException();
@@ -107,7 +107,7 @@
*
* @throws NullPointerException if type is null
*/
- @Override
+ //@Override
public boolean addIDType(final String type) {
if (type==null) {
throw new java.lang.NullPointerException();
@@ -129,7 +129,7 @@
*
* @throws NullPointerException if types is null
*/
- @Override
+ //@Override
public void addIDTypes(Set<String> types) {
if (types==null) {
throw new java.lang.NullPointerException();
@@ -182,7 +182,7 @@
* @throws NullPointerException if idMapping is null
* @throws IllegalArgumentException if one of more types are not found
*/
- @Override
+ //@Override
public void addIDMapping(final Map<String,Set<String>> idMapping) {
if (idMapping==null) {
throw new java.lang.NullPointerException();
@@ -245,7 +245,7 @@
* @throws NullPointerException if type1 or ids1 or type2 or ids2 is
null
* @throws IllegalArgumentException if type1 or type2 is not found
*/
- @Override
+ //@Override
public void addIDMapping(final String type1, final Set<String> ids1,
final String type2, final Set<String> ids2) {
if (type1==null || ids1==null || type2==null || ids2==null) {
@@ -278,7 +278,7 @@
*
* @throws NullPointerException if ids or srcType or tgtType is null
*/
- @Override
+ //@Override
public Map<String, Set<String>> mapID(final Set<String> ids, final
String srcType, final String tgtType) {
if (ids==null || ids.isEmpty()) {
throw new java.lang.IllegalArgumentException("Null of
empty ids");
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/reader/IDMappingTableReader.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/reader/IDMappingTableReader.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/reader/IDMappingTableReader.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -70,7 +70,7 @@
idMappings = null;
}
- @Override
+ //@Override
public void readTable() throws IOException {
idMappings = new IDMappingDataImpl();
@@ -131,7 +131,7 @@
idMappings.addIDMapping(idMapping);
}
- @Override
+ //@Override
public List getColumnNames() {
if (idMappings==null) {
return null;
@@ -144,7 +144,7 @@
* Report the result of import as a string.
* @return Description of
*/
- @Override
+ //@Override
public String getReport() {
if (idMappings == null) {
return "No ID mapping is loaded\n";
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDMappingPreviewDialog.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDMappingPreviewDialog.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDMappingPreviewDialog.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -208,12 +208,12 @@
}
- @Override
+ //@Override
public int getColumnCount() {
return columnNames.size();
}
- @Override
+ //@Override
public int getRowCount() {
return data.size();
}
@@ -223,7 +223,7 @@
return columnNames.get(col);
}
- @Override
+ //@Override
public String getValueAt(int row, int col) {
return data.get(row)[col];
}
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDTypeSelectionTable.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDTypeSelectionTable.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/IDTypeSelectionTable.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -130,7 +130,7 @@
column.setCellRenderer(new TableCellRenderer() {
private DefaultTableCellRenderer defaultRenderer =
new DefaultTableCellRenderer();
- @Override
+ //@Override
public java.awt.Component
getTableCellRendererComponent(JTable table, Object value,
boolean isSelected, boolean hasFocus, int row, int
column) {
JLabel label = (JLabel)
defaultRenderer.getTableCellRendererComponent(table, value, isSelected,
hasFocus, row, column);
@@ -188,12 +188,12 @@
private class IDTypeSelectionTableModel extends AbstractTableModel {
private final String[] columnNames = {"Network","Attribute","ID
Type(s)"};
- @Override
+ //@Override
public int getColumnCount() {
return getRowCount()==0?0:3; // network; attribute; id types
}
- @Override
+ //@Override
public int getRowCount() {
return listNetIDTitleAttr.size();
}
@@ -203,7 +203,7 @@
return columnNames[col];
}
- @Override
+ //@Override
public String getValueAt(int row, int col) {
String[] strs = listNetIDTitleAttr.get(row);
String netID = strs[0];
@@ -241,7 +241,7 @@
this.combos = combos;
}
- @Override
+ //@Override
public java.awt.Component getTableCellRendererComponent(JTable
table, Object value,
boolean isSelected, boolean hasFocus, int row, int column)
{
if (column==table.getColumnCount()-1) {
@@ -365,7 +365,7 @@
this.attr = attr;
}
- @Override
+ //@Override
public Component getListCellRendererComponent(
JList list,
Object value,
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/ReadIDMappingFileTask.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/ReadIDMappingFileTask.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/id/mapping/ui/ReadIDMappingFileTask.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -65,7 +65,7 @@
/**
* Executes Task.
*/
- @Override
+ //@Override
public void run() {
try {
taskMonitor.setStatus("Reading ID mapping from
file.\n\nIt may take a while.\nPlease wait...");
@@ -87,7 +87,7 @@
/**
* Halts the Task: Not Currently Implemented.
*/
- @Override
+ //@Override
public void halt() {
// Task can not currently be halted.
}
@@ -98,7 +98,7 @@
* @param taskMonitor
* TaskMonitor Object.
*/
- @Override
+ //@Override
public void setTaskMonitor(TaskMonitor taskMonitor) throws
IllegalThreadStateException {
this.taskMonitor = taskMonitor;
}
@@ -108,7 +108,7 @@
*
* @return Task Title.
*/
- @Override
+ //@Override
public String getTitle() {
return new String("Reading ID mapping from file");
}
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/AttributeConflictCollectorImpl.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/AttributeConflictCollectorImpl.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/AttributeConflictCollectorImpl.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -82,12 +82,12 @@
this.mapToIDToAttrConflicts = new
HashMap<String,Map<String,Conflicts>>();
}
- @Override
+ //@Override
public boolean isEmpty() {
return mapToIDToAttrConflicts.isEmpty();
}
- @Override
+ //@Override
public Map<String,String> getMapToIDAttr() {
Map<String,String> mapToIDAttr = new HashMap<String,String>();
for (Map.Entry<String,Map<String,Conflicts>> entry :
mapToIDToAttrConflicts.entrySet()) {
@@ -100,7 +100,7 @@
return mapToIDAttr;
}
- @Override
+ //@Override
public Map<String,String> getConflicts(final String toID, final String
toAttr){
if (toID==null || toAttr==null) {
throw new java.lang.NullPointerException();
@@ -114,7 +114,7 @@
return mapToAttrConflicts.get(toAttr).mapFromIDFromAttr;
}
- @Override
+ //@Override
public CyAttributes getCyAttributes(final String toID, final String
toAttr) {
if (toID==null || toAttr==null) {
throw new java.lang.NullPointerException();
@@ -128,7 +128,7 @@
return mapToAttrConflicts.get(toAttr).cyAttributes;
}
- @Override
+ //@Override
public void addConflict(final String fromID,
final String fromAttr,
final String toID,
@@ -157,7 +157,7 @@
conflicts.addConflict(fromID, fromAttr);
}
- @Override
+ //@Override
public boolean removeConflicts(String toID, String toAttr) {
if (toID==null || toAttr==null) {
throw new java.lang.NullPointerException();
@@ -176,7 +176,7 @@
return true;
}
- @Override
+ //@Override
public boolean removeConflict(final String fromID, final String
fromAttr, final String toID, final String toAttr) {
if (fromID==null || fromAttr==null || toID==null ||
toAttr==null) {
throw new java.lang.NullPointerException();
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/DefaultAttributeConflictHandler.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/DefaultAttributeConflictHandler.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/DefaultAttributeConflictHandler.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -56,7 +56,7 @@
* @return
* true if successful, false if failed
*/
- @Override
+ //@Override
public boolean handleIt(final String toID,
final String toAttr,
final Map<String,String> mapFromIDFromAttr,
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/IDMappingAttributeConflictHandler.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/IDMappingAttributeConflictHandler.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/conflict/IDMappingAttributeConflictHandler.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -65,7 +65,7 @@
* @return
* true if successful, false if failed
*/
- @Override
+ //@Override
public boolean handleIt(final String toID,
final String toAttr,
final Map<String,String> mapFromIDFromAttr,
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/AttributeMappingImpl.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/AttributeMappingImpl.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/AttributeMappingImpl.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -70,7 +70,7 @@
mergedAttributeTypes = new Vector<Byte>();
}
- @Override
+ //@Override
public CyAttributes getCyAttributes() {
return cyAttributes;
}
@@ -79,7 +79,7 @@
* Get attributes' names in the merged network
*
*/
- @Override
+ //@Override
public String[] getMergedAttributes() {
return (String[])mergedAttributes.toArray(new String[0]);
}
@@ -88,7 +88,7 @@
* Get number of the attribute in the merged network
*
*/
- @Override
+ //@Override
public int getSizeMergedAttributes() {
return mergedAttributes.size();
}
@@ -97,7 +97,7 @@
* Get the ith attribute name in the merged network
*
*/
- @Override
+ //@Override
public String getMergedAttribute(final int index) {
if (index<0 || index>=getSizeMergedAttributes()) {
throw new java.lang.IndexOutOfBoundsException("Index out of
boundary.");
@@ -111,7 +111,7 @@
* Set the ith attribute name in the merged network
*
*/
- @Override
+ //@Override
public String setMergedAttribute(final int index, final String
attributeName) {
if (attributeName==null) {
throw new java.lang.NullPointerException("Attribute name is
null.");
@@ -218,7 +218,7 @@
* Check if an attribute exists in the merged attributes
*
*/
- @Override
+ //@Override
public boolean containsMergedAttribute(final String attributeName) {
if (attributeName==null) {
throw new java.lang.NullPointerException("Attribute name is
null.");
@@ -230,7 +230,7 @@
* Get the original attribute name in the network before merged
*
*/
- @Override
+ //@Override
public String getOriginalAttribute(final String netID, final String
mergedAttributeName) {
if (netID==null||mergedAttributeName==null) {
throw new java.lang.NullPointerException("Null netID or
mergedAttributeName");
@@ -246,7 +246,7 @@
* Get the original attribute name before merged, corresponding to the ith
merged attribute
*
*/
- @Override
+ //@Override
public String getOriginalAttribute(final String netID, final int index) {
final List<String> attrs = attributeMapping.get(netID);
if (attrs==null) {
@@ -265,7 +265,7 @@
*
* @return the original attribute if exist, null otherwise
*/
- @Override
+ //@Override
public Map<String,String> getOriginalAttributeMap(String
mergedAttributeName) {
if (mergedAttributeName==null) {
throw new java.lang.NullPointerException("Null netID or
mergedAttributeName");
@@ -282,7 +282,7 @@
*
* @return the original attribute if exist, null otherwise
*/
- @Override
+ //@Override
public Map<String,String> getOriginalAttributeMap(int index) {
if (index>=this.getSizeMergedAttributes()||index<0) {
throw new java.lang.IndexOutOfBoundsException();
@@ -308,7 +308,7 @@
* Set attribute mapping
*
*/
- @Override
+ //@Override
public String setOriginalAttribute(final String netID, final String
attributeName, final String mergedAttributeName) {
if (netID==null||mergedAttributeName==null) {
throw new java.lang.NullPointerException("Null netID or
mergedAttributeName");
@@ -324,7 +324,7 @@
* Set attribute mapping
*
*/
- @Override
+ //@Override
public String setOriginalAttribute(final String netID, final String
attributeName, final int index){
if (netID==null||attributeName==null||attributeName==null) {
throw new java.lang.NullPointerException("Null netID or
attributeName or mergedAttributeName");
@@ -362,7 +362,7 @@
* remove original attribute
*
*/
- @Override
+ //@Override
public String removeOriginalAttribute(final String netID, final String
mergedAttributeName) {
if (netID==null||mergedAttributeName==null) {
throw new java.lang.NullPointerException("Null netID or
mergedAttributeName");
@@ -380,7 +380,7 @@
* remove original attribute
*
*/
- @Override
+ //@Override
public String removeOriginalAttribute(final String netID, final int index)
{
if (netID==null) {
throw new java.lang.NullPointerException("Null netID");
@@ -404,7 +404,7 @@
* remove merged attribute, along with the corresponding origianl attribute
*
*/
- @Override
+ //@Override
public String removeMergedAttribute(final String mergedAttributeName) {
if (mergedAttributeName==null) {
throw new java.lang.NullPointerException("Null
mergedAttributeName");
@@ -422,7 +422,7 @@
* remove merged attribute, along with the corresponding origianl attribute
*
*/
- @Override
+ //@Override
public String removeMergedAttribute(final int index) {
if (index<0 || index>=getSizeMergedAttributes()) {
throw new java.lang.IndexOutOfBoundsException("Index out of
bounds");
@@ -445,7 +445,7 @@
* Add new attribute in the end of the current network
*
*/
- @Override
+ //@Override
public String addAttributes(final Map<String,String>
mapNetIDAttributeName, final String mergedAttrName) {
return
addAttributes(mapNetIDAttributeName,mergedAttrName,getSizeMergedAttributes());
}
@@ -454,7 +454,7 @@
* Add new attribute in the ith of the current network
*
*/
- @Override
+ //@Override
public String addAttributes(final Map<String,String>
mapNetIDAttributeName, final String mergedAttrName, final int index) {
if (mapNetIDAttributeName==null || mergedAttrName==null) {
throw new java.lang.NullPointerException();
@@ -502,7 +502,7 @@
*
*
*/
- @Override
+ //@Override
public void addNetwork(final String netID) {
if (netID==null) {
throw new java.lang.NullPointerException();
@@ -594,7 +594,7 @@
* get all network titles
*
*/
- @Override
+ //@Override
public Set<String> getNetworkSet() {
return attributeMapping.keySet();
}
@@ -603,7 +603,7 @@
* get number of networks
*
*/
- @Override
+ //@Override
public int getSizeNetwork() {
return attributeMapping.size();
}
@@ -612,7 +612,7 @@
*
*
*/
- @Override
+ //@Override
public void removeNetwork(final String netID) {
if (netID==null) {
throw new java.lang.NullPointerException();
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/MatchingAttributeImpl.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/MatchingAttributeImpl.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/model/MatchingAttributeImpl.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -58,7 +58,7 @@
attributeForMatching = new HashMap<String,String>();
}
- @Override
+ //@Override
public Map<String,String> getNetAttrMap() {
return attributeForMatching;
}
@@ -67,7 +67,7 @@
* Get the attribute of network for matching node
*
*/
- @Override
+ //@Override
public String getAttributeForMatching(final String netID) {
if (netID == null) {
throw new java.lang.NullPointerException();
@@ -80,7 +80,7 @@
* Set the attribute of network for matching node
*
*/
- @Override
+ //@Override
public void putAttributeForMatching(final String netID, final String
attributeName) {
if (netID==null || attributeName==null) {
throw new java.lang.NullPointerException();
@@ -93,7 +93,7 @@
* add/select the attribute of network for matching node
*
*/
- @Override
+ //@Override
public void addNetwork(final String netID) {
if (netID == null) {
throw new java.lang.NullPointerException();
@@ -118,7 +118,7 @@
* Remove the network, return the attribute
*
*/
- @Override
+ //@Override
public String removeNetwork(final String netID) {
if (netID == null) {
throw new java.lang.NullPointerException();
@@ -131,7 +131,7 @@
*
*
*/
- @Override
+ //@Override
public int getSizeNetwork() {
return attributeForMatching.size();
}
@@ -140,7 +140,7 @@
*
*
*/
- @Override
+ //@Override
public Set<String> getNetworkSet() {
return attributeForMatching.keySet();
}
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/ComboBoxTableCellRenderer.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/ComboBoxTableCellRenderer.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/ComboBoxTableCellRenderer.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -21,7 +21,7 @@
super(items);
}
- @Override
+ //@Override
public java.awt.Component getTableCellRendererComponent(JTable table,
Object value,
boolean isSelected, boolean hasFocus, int row, int column) {
this.setSelectedItem(value);
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MatchNodeTable.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MatchNodeTable.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MatchNodeTable.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -103,12 +103,12 @@
resetNetworks();
}
- @Override
+ //@Override
public int getColumnCount() {
return matchingAttribute.getSizeNetwork();
}
- @Override
+ //@Override
public int getRowCount() {
int n = matchingAttribute.getSizeNetwork();
return n==0?0:1;
@@ -119,7 +119,7 @@
return netNames.get(col);
}
- @Override
+ //@Override
public Object getValueAt(int row, int col) {
return matchingAttribute.getAttributeForMatching(netIDs.get(col));
}
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MergeAttributeTable.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MergeAttributeTable.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/MergeAttributeTable.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -138,7 +138,7 @@
private DefaultTableCellRenderer defaultRenderer = new
DefaultTableCellRenderer();
private ComboBoxTableCellRenderer comboBoxRenderer = new
ComboBoxTableCellRenderer(attrs);
- @Override
+ //@Override
public Component getTableCellRendererComponent(
JTable table, Object value,
boolean isSelected, boolean hasFocus,
@@ -171,7 +171,7 @@
column.setCellRenderer(new TableCellRenderer() {
private DefaultTableCellRenderer defaultRenderer = new
DefaultTableCellRenderer();
- @Override
+ //@Override
public Component getTableCellRendererComponent(
JTable table, Object value,
boolean isSelected, boolean hasFocus,
@@ -263,7 +263,7 @@
private DefaultTableCellRenderer defaultRenderer = new
DefaultTableCellRenderer();
//private ComboBoxTableCellRenderer comboBoxRenderer = new
ComboBoxTableCellRenderer(attrs);
- @Override
+ //@Override
public Component getTableCellRendererComponent(
JTable table, Object value,
boolean isSelected, boolean hasFocus,
@@ -422,13 +422,13 @@
resetNetworks();
}
- @Override
+ //@Override
public int getColumnCount() {
final int n = attributeMapping.getSizeNetwork();
return n==0?0:n+2;
}
- @Override
+ //@Override
public int getRowCount() {
int n = attributeMapping.getSizeMergedAttributes();
//n = n+1; // +1: add an empty row in the end (TODO: use this one
in Cytoscape3.0)
@@ -453,7 +453,7 @@
return null;
}
- @Override
+ //@Override
public String getValueAt(final int row, final int col) {
//final int iAttr = row; //TODO used in Cytoscape3
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/NetworkMergeFrame.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/NetworkMergeFrame.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/ui/NetworkMergeFrame.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -851,12 +851,12 @@
model = new TreeMap<String,CyNetwork>();
}
- @Override
+ //@Override
public int getSize() {
return model.size();
}
- @Override
+ //@Override
public CyNetwork getElementAt(int index) {
return (CyNetwork) model.values().toArray()[index];
}
@@ -923,7 +923,7 @@
* @throws
* @throws Exception
*/
- @Override
+ //@Override
public void run() {
taskMonitor.setStatus("Merging networks.\n\nIt may take a
while.\nPlease wait...");
taskMonitor.setPercentCompleted(0);
@@ -1000,7 +1000,7 @@
/**
* Halts the Task: Not Currently Implemented.
*/
- @Override
+ //@Override
public void halt() {
// Task can not currently be halted.
taskMonitor.setPercentCompleted(100);
@@ -1013,7 +1013,7 @@
* @param taskMonitor
* TaskMonitor Object.
*/
- @Override
+ //@Override
public void setTaskMonitor(TaskMonitor taskMonitor) throws
IllegalThreadStateException {
this.taskMonitor = taskMonitor;
}
@@ -1023,7 +1023,7 @@
*
* @return Task Title.
*/
- @Override
+ //@Override
public String getTitle() {
return "Merging networks";
}
@@ -1051,7 +1051,7 @@
* @throws
* @throws Exception
*/
- @Override
+ //@Override
public void run() {
taskMonitor.setStatus("Handle conflicts.\n\nIt may take a
while.\nPlease wait...");
taskMonitor.setPercentCompleted(0);
@@ -1090,7 +1090,7 @@
/**
* Halts the Task: Not Currently Implemented.
*/
- @Override
+ //@Override
public void halt() {
// Task can not currently be halted.
taskMonitor.setPercentCompleted(100);
@@ -1103,7 +1103,7 @@
* @param taskMonitor
* TaskMonitor Object.
*/
- @Override
+ //@Override
public void setTaskMonitor(TaskMonitor taskMonitor) throws
IllegalThreadStateException {
this.taskMonitor = taskMonitor;
}
@@ -1113,7 +1113,7 @@
*
* @return Task Title.
*/
- @Override
+ //@Override
public String getTitle() {
return "Merging networks";
}
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/CopyingAttributeValueVisitor.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/CopyingAttributeValueVisitor.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/CopyingAttributeValueVisitor.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -61,7 +61,7 @@
this.toAttrName = toAttrName;
}
- @Override
+ //@Override
public void visitingAttributeValue(String fromID, String attrName,
CyAttributes attrs, Object[]
keySpace,
Object visitedValue) {
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeMerger.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeMerger.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeMerger.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -67,7 +67,7 @@
* @param attrs
* @param conflictCollector
*/
- @Override
+ //@Override
public void mergeAttribute(final Map<String,String> mapGOAttr,
final String toID,
final String toAttrName,
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeValueMatcher.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeValueMatcher.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/DefaultAttributeValueMatcher.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -57,7 +57,7 @@
* @param cyAttributes
* @return true if matched; false otherwise
*/
- @Override
+ //@Override
public boolean matched(String id1, String attr1,
String id2, String attr2, CyAttributes cyAttributes) {
if ((id1 == null) || (attr1 == null) || (id2 == null) ||
(attr2==null) || (cyAttributes == null)) {
Modified:
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/IDMappingAttributeValueMatcher.java
===================================================================
---
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/IDMappingAttributeValueMatcher.java
2008-09-16 00:08:00 UTC (rev 14913)
+++
csplugins/trunk/soc/jgao/NetworkMerge/src/csplugins/network/merge/util/IDMappingAttributeValueMatcher.java
2008-09-16 00:35:01 UTC (rev 14914)
@@ -66,7 +66,7 @@
* @param cyAttributes
* @return true if matched; false otherwise
*/
- @Override
+ //@Override
public boolean matched(String id1, String attr1,
String id2, String attr2, CyAttributes cyAttributes) {
if ((id1 == null) || (attr1 == null) || (id2 == null) ||
(attr2==null) || (cyAttributes == null)) {
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
