Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: MODIFIED: base ...

gef
Discussion topic

Back to topic list

CVS update: MODIFIED: base ...

Reply

Author andreas
Full name Andreas Rueckert
Date 2001-11-19 07:41:33 PST
Message User: andreas
  Date: 01/11/19 07:41:33

  Modified: src/org/tigris/gef/base CmdCreateNode.java ModePlace.java
  Log:
  Added Curt Arnold's fix for issue 188. Status bar shows additional info when existing node is added.
  
  Revision Changes Path
  1.3 +2 -1 argouml/src_new/org/​argouml/ui/TreeResou​rceBundle.java
  
  http://argouml.tigri​s.org/source/browse/​argouml/src_new/org/​argouml/ui/TreeResou​rceBundle.java.diff?​r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeResourceBundle.java
  ====================​====================​====================​=======
  RCS file: /usr/local/tigris/da​ta/helm/cvs/reposito​ry/argouml/src_new/o​rg/argouml/ui/TreeRe​sourceBundle.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TreeResourceBundle.java 2001/09/28 15:02:02 1.2
  +++ TreeResourceBundle.java 2001/11/19 15:41:33 1.3
  @@ -80,7 +80,8 @@
           { "Link->Stimuli", "Link->Stimuli" },
           { "Stimulus->Action", "Stimulus->Action" },
       { "Properties", "Properties" },
  - { "Add to Diagram", "Add to Diagram"}
  + { "Add to Diagram", "Add to Diagram"},
  + { "Click on diagram to add ", "Click on diagram to add "}
      };
   
        public Object[][] getContents() {
  
  
  
  1.2 +2 -1 argouml/src_new/org/​argouml/ui/TreeResou​rceBundle_de.java
  
  http://argouml.tigri​s.org/source/browse/​argouml/src_new/org/​argouml/ui/TreeResou​rceBundle_de.java.di​ff?r1=1.1&r2=1.2​
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeResourceBundle_de.java
  ====================​====================​====================​=======
  RCS file: /usr/local/tigris/da​ta/helm/cvs/reposito​ry/argouml/src_new/o​rg/argouml/ui/TreeRe​sourceBundle_de.java​,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TreeResourceBundle_de.java 2001/09/28 15:02:02 1.1
  +++ TreeResourceBundle_de.java 2001/11/19 15:41:33 1.2
  @@ -80,7 +80,8 @@
           { "Link->Stimuli", "Link->Stimuli" },
           { "Stimulus->Action", "Stimulus->Aktion" },
       { "Properties", "Eigenschaften" },
  - { "Add to Diagram", "Zum Diagramm hinzuf\u00fcgen"}
  + { "Add to Diagram", "Zum Diagramm hinzuf\u00fcgen"},
  + { "Click on diagram to add ", "Auf Diagramm klicken zum hinzuf\u00fcgen von "}
      };
   
        public Object[][] getContents() {
  
  
  
  1.3 +15 -3 argouml/src_new/org/​argouml/uml/diagram/​ui/ActionAddExisting​Node.java
  
  http://argouml.tigri​s.org/source/browse/​argouml/src_new/org/​argouml/uml/diagram/​ui/ActionAddExisting​Node.java.diff?r1=1.​2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ActionAddExistingNode.java
  ====================​====================​====================​=======
  RCS file: /usr/local/tigris/da​ta/helm/cvs/reposito​ry/argouml/src_new/o​rg/argouml/uml/diagr​am/ui/ActionAddExist​ingNode.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ActionAddExistingNode.java 2001/01/09 07:16:01 1.2
  +++ ActionAddExistingNode.java 2001/11/19 15:41:33 1.3
  @@ -20,6 +20,7 @@
   
   import org.tigris.gef.base.*;
   import org.tigris.gef.graph.*;
  +import org.tigris.gef.util.Localizer;
   
   import org.argouml.ui.*;
   import org.argouml.uml.ui.*;
  @@ -48,7 +49,8 @@
       public boolean shouldBeEnabled() {
       ProjectBrowser pb = ProjectBrowser.TheInstance;
       Object target = pb.getDetailsTarget();
  - if (target instanceof MModelElement) return true;
  + if (target instanceof MModelElement)
  + return true;
       return false;
       }
   
  @@ -57,8 +59,18 @@
       GraphModel gm = ce.getGraphModel();
       if (!(gm instanceof MutableGraphModel)) return;
   
  - Mode placeMode = new ModePlace(this);
  - ((ModePlace)placeMod​e).setAddRelatedEdge​s(true);
  + String instructions = null;
  + if(_object != null) {
  + instructions = Localizer.localize ("Tree", "Click on diagram to add ") + _object.toString();
  + Globals.showStatus(i​nstructions);
  + }
  + ModePlace placeMode = new ModePlace(this,instructions);
  + placeMode.setAddRela​tedEdges(true);
  +
  + //
  + // This only occurs when an diagram is entered
  + //
  + //
   
       Globals.mode(placeMode, false );
       }
  
  
  
  1.3 +6 -2 gef/src/org/tigris/g​ef/base/CmdCreateNod​e.java
  
  http://gef.tigris.or​g/source/browse/gef/​src/org/tigris/gef/b​ase/CmdCreateNode.ja​va.diff?r1=1.2&r​2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CmdCreateNode.java
  ====================​====================​====================​=======
  RCS file: /usr/local/tigris/da​ta/helm/cvs/reposito​ry/gef/src/org/tigri​s/gef/base/CmdCreate​Node.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- CmdCreateNode.java 2001/08/03 11:03:54 1.2
  +++ CmdCreateNode.java 2001/11/19 15:41:33 1.3
  @@ -27,7 +27,7 @@
   // File: CmdCreateNode.java
   // Classes: CmdCreateNode
   // Original Author: jrobbins at ics dot uci dot edu
  -// $Id: CmdCreateNode.java,v 1.2 2001/08/03 11:03:54 1sturm Exp $
  +// $Id: CmdCreateNode.java,v 1.3 2001/11/19 15:41:33 andreas Exp $
   
   package org.tigris.gef.base;
   
  @@ -103,7 +103,11 @@
       if (!(gm instanceof MutableGraphModel)) return;
       setArg("graphModel", gm);
   
  - Mode placeMode = new ModePlace(this);
  + String instructions = null;
  + Object actionName = getValue(javax.swing​.Action.NAME);
  + if(actionName != null)
  + instructions = "Click to place " + actionName.toString();
  + Mode placeMode = new ModePlace(this,instructions);
   
       Object shouldBeSticky = getArg("shouldBeSticky");
       Globals.mode(placeMode, shouldBeSticky == Boolean.TRUE);
  
  
  
  1.3 +14 -4 gef/src/org/tigris/g​ef/base/ModePlace.ja​va
  
  http://gef.tigris.or​g/source/browse/gef/​src/org/tigris/gef/b​ase/ModePlace.java.d​iff?r1=1.2&r2=1.​3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ModePlace.java
  ====================​====================​====================​=======
  RCS file: /usr/local/tigris/da​ta/helm/cvs/reposito​ry/gef/src/org/tigri​s/gef/base/ModePlace​.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ModePlace.java 2000/10/16 12:04:47 1.2
  +++ ModePlace.java 2001/11/19 15:41:33 1.3
  @@ -24,7 +24,7 @@
   // File: ModePlace.java
   // Classes: ModePlace
   // Original Author: jrobbins at ics dot uci dot edu
  -// $Id: ModePlace.java,v 1.2 2000/10/16 12:04:47 1sturm Exp $
  +// $Id: ModePlace.java,v 1.3 2001/11/19 15:41:33 andreas Exp $
   
   package org.tigris.gef.base;
   
  @@ -59,6 +59,8 @@
   
     protected boolean _addRelatedEdges = false;
   
  + protected String _instructions;
  +
     ////////////////////​////////////////////​////////////////////​////
     // constructor
   
  @@ -67,6 +69,14 @@
       _factory = gf;
       _node = null;
       _pers = null;
  + _instructions = null;
  + }
  +
  + public ModePlace(GraphFactory gf,String instructions) {
  + _factory = gf;
  + _node = null;
  + _pers = null;
  + _instructions = instructions;
     }
   
     ////////////////////​////////////////////​////////////////////​////
  @@ -75,9 +85,9 @@
     /** A string to be shown in the status bar of the Editor when this
      * mode is on top of the ModeManager. */
     public String instructions() {
  - if (_node != null) return "Click to place " + _node.toString();
  - //if (_factory != null) return "Click to place " + _factory.toString();
  - return "";
  + if(_instructions == null)
  + _instructions = "";
  + return _instructions;
     }
   
     /** By default all creation modes use CROSSHAIR_CURSOR. */
  
  
  

--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe at gef dot tigris dot org
For additional commands, e-mail: cvs-help at gef dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: MODIFIED: base ... andreas Andreas Rueckert 2001-11-19 07:41:33 PST
Messages per page: