[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus ModelPopupMenu.java,1.10,1.11 NOMenuBar.java,1.12,1.13 TreePopupMenu.java,1.4,1.5

[<efl...@us...>]

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus
In directory sc8-pr-cvs1:/tmp/cvs-serv28289/src/org/devaki/nextobjects/ui/menus

Modified Files:
	ModelPopupMenu.java NOMenuBar.java TreePopupMenu.java 
Log Message:
First step in adding ability to have mabels and model's titles + checkstyle


Index: ModelPopupMenu.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/ModelPopupMenu.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ModelPopupMenu.java	24 May 2003 18:50:47 -0000	1.10
--- ModelPopupMenu.java	8 Jun 2003 09:28:26 -0000	1.11
***************
*** 40,48 ****
--- 40,51 ----
  import org.devaki.nextobjects.workspace.models.objects.Constraint;
  import org.devaki.nextobjects.workspace.models.objects.Entity;
+ import org.devaki.nextobjects.workspace.models.objects.Label;
  import org.devaki.nextobjects.workspace.models.objects.InheritanceLink;
  import org.devaki.nextobjects.workspace.models.objects.Table;
  import org.devaki.nextobjects.workspace.models.objects.BaseClass;
+ import org.devaki.nextobjects.workspace.models.objects.BaseLine;
  import org.devaki.nextobjects.workspace.models.graphics.ClassView;
  import org.devaki.nextobjects.workspace.models.graphics.LineView;
+ import org.devaki.nextobjects.workspace.models.graphics.LabelView;
  
  
***************
*** 116,119 ****
--- 119,126 ----
      /** Listeners **/
      // Action Listeners
+ 	//TODO add public abstract Dimension autoResize(Boolean actIt) in ClassView.java
+ 	//TODO add private autoResize(Label pLabel){}
+ 	//TODO add private autoResize(ClassView pClassView) {}	
+ 	
      jMenuItemResize.addActionListener(new ActionListener()
      {
***************
*** 127,137 ****
              ((ClassView)ModelMan.getCurrentObject().getObjectView())
                  .autoResize(true);
!         } else {
            ((LineView)ModelMan.getCurrentObject().getObjectView())
                .computeBestPoints();
!         }
          }
        }
      });
      this.jMenuItemNew.addActionListener(new ActionListener()
      {
--- 134,147 ----
              ((ClassView)ModelMan.getCurrentObject().getObjectView())
                  .autoResize(true);
!         } else if (ModelMan.getCurrentObject() instanceof BaseLine) {
            ((LineView)ModelMan.getCurrentObject().getObjectView())
                .computeBestPoints();
! 		  } else if (ModelMan.getCurrentObject() instanceof Label) {	  	
! 		  	((LabelView)((Label)ModelMan.getCurrentObject()).getObjectView()).autoResize(true);
!           }
          }
        }
      });
+ 
      this.jMenuItemNew.addActionListener(new ActionListener()
      {
***************
*** 141,150 ****
          {
            ModelMan.newObject(((ConceptualModel)ModelMan.getCurrentModel())
!                              .getConceptualView(), new Point(X, Y));
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
          {
            ModelMan.newObject(((PhysicalModel)ModelMan.getCurrentModel())
!                              .getPhysicalView(), new Point(X, Y));
          }
        }
--- 151,160 ----
          {
            ModelMan.newObject(((ConceptualModel)ModelMan.getCurrentModel())
!                              .getModelView(), new Point(X, Y));
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
          {
            ModelMan.newObject(((PhysicalModel)ModelMan.getCurrentModel())
!                              .getModelView(), new Point(X, Y));
          }
        }
***************
*** 183,187 ****
            ModelMan.delete();
            ((ConceptualModel)ModelMan.getCurrentModel())
!               .getConceptualView().repaint();
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
--- 193,197 ----
            ModelMan.delete();
            ((ConceptualModel)ModelMan.getCurrentModel())
!               .getModelView().repaint();
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
***************
*** 189,193 ****
            ModelMan.delete();
            ((PhysicalModel)ModelMan.getCurrentModel())
!               .getPhysicalView().repaint();
          }
        }
--- 199,203 ----
            ModelMan.delete();
            ((PhysicalModel)ModelMan.getCurrentModel())
!               .getModelView().repaint();
          }
        }

Index: NOMenuBar.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/NOMenuBar.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NOMenuBar.java	28 May 2003 21:48:27 -0000	1.12
--- NOMenuBar.java	8 Jun 2003 09:28:26 -0000	1.13
***************
*** 226,230 ****
            ModelMan.delete();
            ((ConceptualModel)ModelMan.getCurrentModel())
!               .getConceptualView().repaint();
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
--- 226,230 ----
            ModelMan.delete();
            ((ConceptualModel)ModelMan.getCurrentModel())
!               .getModelView().repaint();
          }
          else if(ModelMan.getCurrentModel()instanceof PhysicalModel)
***************
*** 232,236 ****
            ModelMan.delete();
            ((PhysicalModel)ModelMan.getCurrentModel())
!               .getPhysicalView().repaint();
          }
        }
--- 232,236 ----
            ModelMan.delete();
            ((PhysicalModel)ModelMan.getCurrentModel())
!               .getModelView().repaint();
          }
        }

Index: TreePopupMenu.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/ui/menus/TreePopupMenu.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TreePopupMenu.java	27 Apr 2003 17:05:26 -0000	1.4
--- TreePopupMenu.java	8 Jun 2003 09:28:26 -0000	1.5
***************
*** 200,208 ****
                      if (objectParent instanceof ConceptualModel) {
                          ModelMan.delete();
!                         ((ConceptualModel) ModelMan.getCurrentModel()).getConceptualView().
                                  repaint();
                      } else if (objectParent instanceof PhysicalModel) {
                          ModelMan.delete();
!                         ((PhysicalModel) ModelMan.getCurrentModel()).getPhysicalView().repaint();
                      }
                      ModelMan.getCurrentModel().getPanel().repaint();
--- 200,208 ----
                      if (objectParent instanceof ConceptualModel) {
                          ModelMan.delete();
!                         ((ConceptualModel) ModelMan.getCurrentModel()).getModelView().
                                  repaint();
                      } else if (objectParent instanceof PhysicalModel) {
                          ModelMan.delete();
!                         ((PhysicalModel) ModelMan.getCurrentModel()).getModelView().repaint();
                      }
                      ModelMan.getCurrentModel().getPanel().repaint();