[graphl-cvs] graphl/src/org/mediavirus/graphl/gui NodeContextMenu.java EdgeContextMenu.java

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31344/src/org/mediavirus/graphl/gui

Modified Files:
	NodeContextMenu.java EdgeContextMenu.java 
Log Message:
big refactoring:
* AssignableNodeController has been renamed to Facet
* many methods renamed accordingly
* new package for painters
* moved around some classes to match new package structure

Index: EdgeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/EdgeContextMenu.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EdgeContextMenu.java	23 Jul 2004 08:57:30 -0000	1.7
--- EdgeContextMenu.java	2 Aug 2004 12:36:48 -0000	1.8
***************
*** 19,24 ****
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.layout.EdgeLayouter;
! import org.mediavirus.graphl.view.AssignableGraphController;
! import org.mediavirus.graphl.view.EdgePainter;
  import org.mediavirus.graphl.vocabulary.ResourceActionListener;
  import org.mediavirus.graphl.vocabulary.ResourceMenu;
--- 19,24 ----
  import org.mediavirus.graphl.graph.Edge;
  import org.mediavirus.graphl.layout.EdgeLayouter;
! import org.mediavirus.graphl.painter.EdgePainter;
! import org.mediavirus.graphl.view.Facet;
  import org.mediavirus.graphl.vocabulary.ResourceActionListener;
  import org.mediavirus.graphl.vocabulary.ResourceMenu;
***************
*** 71,79 ****
      private final class AssignControllerListener implements ActionListener {
      	
!         private AssignableGraphController controller;
          private boolean applyToEdge;
          private boolean clone = false;
          
!         public AssignControllerListener(AssignableGraphController controller, boolean applyToEdge, boolean clone) {
              this.controller = controller;
              this.applyToEdge = applyToEdge;
--- 71,79 ----
      private final class AssignControllerListener implements ActionListener {
      	
!         private Facet controller;
          private boolean applyToEdge;
          private boolean clone = false;
          
!         public AssignControllerListener(Facet controller, boolean applyToEdge, boolean clone) {
              this.controller = controller;
              this.applyToEdge = applyToEdge;
***************
*** 82,88 ****
          
          public void actionPerformed(ActionEvent e) {
!         	AssignableGraphController newController;
              if (clone) {
!             	newController = (AssignableGraphController)controller.clone();
              }
              else {
--- 82,88 ----
          
          public void actionPerformed(ActionEvent e) {
!         	Facet newController;
              if (clone) {
!             	newController = (Facet)controller.clone();
              }
              else {
***************
*** 193,198 ****
      private JMenu buildEdgeControllerSubMenu(Edge edge, int controllerType) {
          
!     	AssignableGraphController defaultController = null;
!         AssignableGraphController currentController = null;
          Iterator availableControllers = null;        
          
--- 193,198 ----
      private JMenu buildEdgeControllerSubMenu(Edge edge, int controllerType) {
          
!     	Facet defaultController = null;
!         Facet currentController = null;
          Iterator availableControllers = null;        
          
***************
*** 223,228 ****
  	private JMenu buildTypeControllerSubMenu(Edge edge, int controllerType) {
  
!         AssignableGraphController defaultController = null;
!         AssignableGraphController currentController = null;
          Iterator availableControllers = null;        
  
--- 223,228 ----
  	private JMenu buildTypeControllerSubMenu(Edge edge, int controllerType) {
  
!         Facet defaultController = null;
!         Facet currentController = null;
          Iterator availableControllers = null;        
  
***************
*** 255,259 ****
  	 * @return
  	 */
! 	protected JMenu buildControllerSubMenu(AssignableGraphController defaultController, AssignableGraphController currentController, Iterator availableControllers, boolean applyToEdge) {
  		JMenu menu = new JMenu();
      	JMenuItem defaultItem = new JRadioButtonMenuItem();
--- 255,259 ----
  	 * @return
  	 */
! 	protected JMenu buildControllerSubMenu(Facet defaultController, Facet currentController, Iterator availableControllers, boolean applyToEdge) {
  		JMenu menu = new JMenu();
      	JMenuItem defaultItem = new JRadioButtonMenuItem();
***************
*** 284,288 ****
          
          while (availableControllers.hasNext()) {
!         	AssignableGraphController controller = (AssignableGraphController) availableControllers.next();
              menu.add(createEdgeControllerMenuItem(controller, applyToEdge));
          }
--- 284,288 ----
          
          while (availableControllers.hasNext()) {
!         	Facet controller = (Facet) availableControllers.next();
              menu.add(createEdgeControllerMenuItem(controller, applyToEdge));
          }
***************
*** 295,299 ****
       * @return
       */
!     private JMenuItem createEdgeControllerMenuItem(AssignableGraphController controller, boolean applyToEdge) {
  
          String name = controller.getName();
--- 295,299 ----
       * @return
       */
!     private JMenuItem createEdgeControllerMenuItem(Facet controller, boolean applyToEdge) {
  
          String name = controller.getName();

Index: NodeContextMenu.java
===================================================================
RCS file: /cvsroot/graphl/graphl/src/org/mediavirus/graphl/gui/NodeContextMenu.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NodeContextMenu.java	27 Jul 2004 13:24:06 -0000	1.8
--- NodeContextMenu.java	2 Aug 2004 12:36:32 -0000	1.9
***************
*** 19,24 ****
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.layout.NodeLayouter;
! import org.mediavirus.graphl.view.AssignableGraphController;
! import org.mediavirus.graphl.view.NodePainter;
  import org.mediavirus.graphl.vocabulary.ResourceActionListener;
  import org.mediavirus.graphl.vocabulary.ResourceMenu;
--- 19,24 ----
  import org.mediavirus.graphl.graph.Node;
  import org.mediavirus.graphl.layout.NodeLayouter;
! import org.mediavirus.graphl.painter.NodePainter;
! import org.mediavirus.graphl.view.Facet;
  import org.mediavirus.graphl.vocabulary.ResourceActionListener;
  import org.mediavirus.graphl.vocabulary.ResourceMenu;
***************
*** 71,79 ****
      private final class AssignControllerListener implements ActionListener {
      	
!         private AssignableGraphController controller;
          private boolean applyToNode;
          private boolean clone = false;
          
!         public AssignControllerListener(AssignableGraphController controller, boolean applyToNode, boolean clone) {
              this.controller = controller;
              this.applyToNode = applyToNode;
--- 71,79 ----
      private final class AssignControllerListener implements ActionListener {
      	
!         private Facet controller;
          private boolean applyToNode;
          private boolean clone = false;
          
!         public AssignControllerListener(Facet controller, boolean applyToNode, boolean clone) {
              this.controller = controller;
              this.applyToNode = applyToNode;
***************
*** 82,88 ****
          
          public void actionPerformed(ActionEvent e) {
!         	AssignableGraphController newController;
              if (clone) {
!             	newController = (AssignableGraphController)controller.clone();
              }
              else {
--- 82,88 ----
          
          public void actionPerformed(ActionEvent e) {
!         	Facet newController;
              if (clone) {
!             	newController = (Facet)controller.clone();
              }
              else {
***************
*** 193,198 ****
      private JMenu buildNodeControllerSubMenu(Node node, int controllerType) {
          
!     	AssignableGraphController defaultController = null;
!         AssignableGraphController currentController = null;
          Iterator availableControllers = null;        
          
--- 193,198 ----
      private JMenu buildNodeControllerSubMenu(Node node, int controllerType) {
          
!     	Facet defaultController = null;
!         Facet currentController = null;
          Iterator availableControllers = null;        
          
***************
*** 223,228 ****
  	private JMenu buildTypeControllerSubMenu(Node node, int controllerType) {
  
!         AssignableGraphController defaultController = null;
!         AssignableGraphController currentController = null;
          Iterator availableControllers = null;        
  
--- 223,228 ----
  	private JMenu buildTypeControllerSubMenu(Node node, int controllerType) {
  
!         Facet defaultController = null;
!         Facet currentController = null;
          Iterator availableControllers = null;        
  
***************
*** 257,261 ****
  	 * @return
  	 */
! 	protected JMenu buildControllerSubMenu(AssignableGraphController defaultController, AssignableGraphController currentController, Iterator availableControllers, boolean applyToNode) {
  		JMenu menu = new JMenu();
      	JMenuItem defaultItem = new JRadioButtonMenuItem();
--- 257,261 ----
  	 * @return
  	 */
! 	protected JMenu buildControllerSubMenu(Facet defaultController, Facet currentController, Iterator availableControllers, boolean applyToNode) {
  		JMenu menu = new JMenu();
      	JMenuItem defaultItem = new JRadioButtonMenuItem();
***************
*** 286,290 ****
          
          while (availableControllers.hasNext()) {
!         	AssignableGraphController controller = (AssignableGraphController) availableControllers.next();
              menu.add(createNodeControllerMenuItem(controller, applyToNode));
          }
--- 286,290 ----
          
          while (availableControllers.hasNext()) {
!         	Facet controller = (Facet) availableControllers.next();
              menu.add(createNodeControllerMenuItem(controller, applyToNode));
          }
***************
*** 297,301 ****
       * @return
       */
!     private JMenuItem createNodeControllerMenuItem(AssignableGraphController controller, boolean applyToNode) {
  
          String name = controller.getName();
--- 297,301 ----
       * @return
       */
!     private JMenuItem createNodeControllerMenuItem(Facet controller, boolean applyToNode) {
  
          String name = controller.getName();