[Tcotool-cvs] TCO-Tool/src/org/tcotool/application LauncherView.java,1.1.1.1,1.2

[Hirzel P. <ph...@us...>]

Update of /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32335

Modified Files:
	LauncherView.java 
Log Message:
Refactoring: persistent Dependency-Diagram Layout

Index: LauncherView.java
===================================================================
RCS file: /cvsroot/tcotool/TCO-Tool/src/org/tcotool/application/LauncherView.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** LauncherView.java	29 Aug 2005 09:40:52 -0000	1.1.1.1
--- LauncherView.java	16 Sep 2005 14:55:07 -0000	1.2
***************
*** 46,49 ****
--- 46,50 ----
  import org.tcotool.model.*;
  import org.tcotool.pluginsupport.PluginUtility;
+ import org.tcotool.presentation.Diagram;
  import org.tcotool.tools.ModelUtility;
  
***************
*** 67,70 ****
--- 68,72 ----
  	private java.util.List fileFilter = null;
  	private Image image = null;
+ 	private Diagram dependencyDiagram = null;
  	private JMenu mnuEdit = null;
  	private JMenuItem mniFind = null;
***************
*** 2145,2153 ****
  			    } else {
  			        showProgress(30, getResourceString("CIInitGraph"));
! 					org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight());
  					showProgress(50, getResourceString("CIReportInit"));
  					showProgress(65, getResourceString("CIAutoLayout"));
  					depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60);
! 					Layout.doLayout(depView);
  					addReport(depView, getResourceString("MniDependencyGraph_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight());
  			    }
--- 2147,2159 ----
  			    } else {
  			        showProgress(30, getResourceString("CIInitGraph"));
! 			        boolean doLayout = (dependencyDiagram == null);
! 					org.tcotool.standard.drawing.DependencyView depView = new org.tcotool.standard.drawing.DependencyView(getDependencyDiagram(), dependencies, getDtpRoot().getWidth(), getDtpRoot().getHeight());
  					showProgress(50, getResourceString("CIReportInit"));
  					showProgress(65, getResourceString("CIAutoLayout"));
  					depView.setSize(getDtpRoot().getWidth()-70, getDtpRoot().getHeight()-60);
! 					if (doLayout) {
! 					    // only do it the very first time (otherwise User-Layout should be available)
! 						Layout.doLayout(depView);
! 					}
  					addReport(depView, getResourceString("MniDependencyGraph_text"), getDtpRoot().getWidth(), getDtpRoot().getHeight());
  			    }
***************
*** 2349,2352 ****
--- 2355,2360 ----
  		TcoModel root = (TcoModel)server.getObjectById(new DbObjectId(TcoModel.class, new Long(-1 /* will return model-root independent of T_Id*/)), true);
  		server.setUserObject(null);
+ //TODO load Diagram-Basket
+ dependencyDiagram = null;
  		return root;
  	} catch(javax.jdo.JDODataStoreException e) {
***************
*** 2598,2600 ****
--- 2606,2619 ----
  	setModelChanged(false);
  }
+ /**
+  * One Dependency-Graph may be drawn per configuration.
+  * @return
+  */
+ public Diagram getDependencyDiagram() throws Throwable {
+ //TODO NYI: multiple views of dependencies for large or imported Configurations
+     if (dependencyDiagram == null) {
+         dependencyDiagram = (Diagram)server.createInstance((Diagram.class));
+     }
+     return dependencyDiagram;
+ }
  }