From: <jsa...@us...> - 2008-11-13 15:54:55
|
Revision: 97 http://flexotask.svn.sourceforge.net/flexotask/?rev=97&view=rev Author: jsauerbach Date: 2008-11-13 15:54:52 +0000 (Thu, 13 Nov 2008) Log Message: ----------- Fix bug in tooltip display for connection modes. Modified Paths: -------------- trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/Connection.java trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/TaskDiagram.java Modified: trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/Connection.java =================================================================== --- trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/Connection.java 2008-11-12 21:46:22 UTC (rev 96) +++ trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/Connection.java 2008-11-13 15:54:52 UTC (rev 97) @@ -101,8 +101,8 @@ /** The name of the class that is this connection's type */ private String type = ""; - /** The name of this connection's mode */ - private Integer mode = FlexotaskConnectionMode.DEEPCLONE.asIndex(); + /** The mode of this connection */ + private FlexotaskConnectionMode mode = FlexotaskConnectionMode.DEEPCLONE; /** * Create a connection between two tasks @@ -199,7 +199,7 @@ case ID: return getName(); case MODE: - return mode; + return mode.asIndex(); default: return null; } @@ -316,13 +316,8 @@ } labels.add(typeLabel); Label modeLabel = new Label(); - if (type.length() == 0) { - modeLabel.setIcon(WARNING_IMAGE); - modeLabel.setText("Missing mode information"); - } else { - modeLabel.setIcon(OK_IMAGE); - modeLabel.setText("Mode=" + mode); - } + modeLabel.setIcon(OK_IMAGE); + modeLabel.setText("Mode=" + mode); labels.add(modeLabel); if (source instanceof NormalTask) { StringBuilder sb = new StringBuilder("SourcePort=" + getSourcePortName()); @@ -351,7 +346,7 @@ * Get the mode of this connection * @return the mode */ - public Integer getMode() + public FlexotaskConnectionMode getMode() { return mode; } @@ -492,7 +487,7 @@ setType(""); return; case MODE: - setMode(FlexotaskConnectionMode.DEEPCLONE.asIndex()); + setMode(FlexotaskConnectionMode.DEEPCLONE); return; case ID: setName(null); @@ -632,7 +627,7 @@ setType(value == null ? null : value.toString()); break; case MODE: - setMode((Integer) value); + setMode(FlexotaskConnectionMode.getConnectionMode((Integer) value)); break; case ID: setName(value == null ? null : value.toString()); @@ -682,7 +677,7 @@ * Set the model of this connection * @param model the mode to set */ - public void setMode(Integer mode) + public void setMode(FlexotaskConnectionMode mode) { this.mode = mode; computeToolTipAndColor(); @@ -715,7 +710,7 @@ builder.append("' target='").append(target.getName()); builder.append("' targetPort='").append(targetPortName); builder.append("' targetPortBuffering='").append(targetPortBuffering); - builder.append("' mode='").append(FlexotaskConnectionMode.getConnectionMode(mode)); + builder.append("' mode='").append(mode); builder.append("' type='").append(type).append("'>"); addTimingData(builder, newline); builder.append(newline).append("</Connection>"); Modified: trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/TaskDiagram.java =================================================================== --- trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/TaskDiagram.java 2008-11-12 21:46:22 UTC (rev 96) +++ trunk/flexotask-editor/src/com/ibm/realtime/flexotask/editor/model/TaskDiagram.java 2008-11-13 15:54:52 UTC (rev 97) @@ -52,7 +52,6 @@ import com.ibm.realtime.flexotask.editor.dialogs.ClassListPropertyDescriptor; import com.ibm.realtime.flexotask.editor.dialogs.ClassListCellEditor.ClassList; import com.ibm.realtime.flexotask.template.FlexotaskCommunicatorTemplate; -import com.ibm.realtime.flexotask.template.FlexotaskConnectionMode; import com.ibm.realtime.flexotask.template.FlexotaskConnectionTemplate; import com.ibm.realtime.flexotask.template.FlexotaskPredicateTemplate; import com.ibm.realtime.flexotask.template.FlexotaskStableMode; @@ -255,7 +254,7 @@ conn.setTargetPortName(eTarget.getInputPortNames()[eConn.getInputPortToWrite()]); conn.setTargetPortBuffering(eTarget.getInputPortBuffering()[eConn.getInputPortToWrite()]); conn.setType(eSource.getOutputPortTypes()[eConn.getOutputPortToRead()]); - conn.setMode(eConn.getConnectionMode().asIndex()); + conn.setMode(eConn.getConnectionMode()); setTimingData(conn, eConn.getTimingData()); } loaded(); @@ -574,7 +573,7 @@ return new FlexotaskConnectionTemplate(conn.getName(), getTimingData(conn), sourceEnds.get(conn), conn.getSourceIndex(), targetEnds.get(conn), conn.getTargetIndex(), - FlexotaskConnectionMode.getConnectionMode(conn.getMode())); + conn.getMode()); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |