Author: rozagh
Date: 2012-06-18 11:42:07 -0700 (Mon, 18 Jun 2012)
New Revision: 29599
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactoryImpl.java
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
Log:
fixes #1130 implemented isReady method for delete and rename column task
factories. Checked the returning value of isReady in the pop up menu helper.
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
2012-06-18 18:03:25 UTC (rev 29598)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/DeleteColumnTaskFactoryImpl.java
2012-06-18 18:42:07 UTC (rev 29599)
@@ -48,4 +48,9 @@
throw new IllegalStateException("you forgot to set the
CyColumn on this task factory!");
return new TaskIterator(new DeleteColumnTask(undoSupport,
column));
}
+
+ @Override
+ public boolean isReady(CyColumn column) {
+ return !column.isImmutable();
+ }
}
\ No newline at end of file
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactoryImpl.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactoryImpl.java
2012-06-18 18:03:25 UTC (rev 29598)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/table/RenameColumnTaskFactoryImpl.java
2012-06-18 18:42:07 UTC (rev 29599)
@@ -24,7 +24,7 @@
You should have received a copy of the GNU Lesser General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
package org.cytoscape.task.internal.table;
@@ -61,4 +61,9 @@
return
tunableSetter.createTaskIterator(this.createTaskIterator(column), m);
}
-}
\ No newline at end of file
+
+ @Override
+ public boolean isReady(CyColumn column) {
+ return !column.isImmutable();
+ }
+}
Modified:
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
===================================================================
---
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
2012-06-18 18:03:25 UTC (rev 29598)
+++
core3/impl/trunk/table-browser-impl/src/main/java/org/cytoscape/browser/internal/PopupMenuHelper.java
2012-06-18 18:42:07 UTC (rev 29599)
@@ -106,14 +106,15 @@
* in the service properties.
*/
private void createMenuItem(final TaskFactory tf, final
PopupMenuGravityTracker tracker,
- final Map props)
+ final Map props)
{
String menuLabel = (String)(props.get("title"));
if (menuLabel == null)
menuLabel = "Unidentified Task: " +
Integer.toString(tf.hashCode());
- tracker.addMenuItem(new JMenuItem(new PopupAction(tf,
menuLabel)),
- GravityTracker.USE_ALPHABETIC_ORDER);
+ if (tf.isReady())
+ tracker.addMenuItem(new JMenuItem(new PopupAction(tf,
menuLabel)),
+ GravityTracker.USE_ALPHABETIC_ORDER);
}
public void addTableColumnTaskFactory(final TableColumnTaskFactory
newFactory,
--
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.
