Update of /cvsroot/cob/COBEditor/src/edu/iastate/ato/gui/packageview
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv26233/src/edu/iastate/ato/gui/packageview
Modified Files:
PackageView.java PackageTreeDargDropListener.java
Log Message:
Index: PackageTreeDargDropListener.java
===================================================================
RCS file: /cvsroot/cob/COBEditor/src/edu/iastate/ato/gui/packageview/PackageTreeDargDropListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PackageTreeDargDropListener.java 17 Jun 2006 13:49:28 -0000 1.2
--- PackageTreeDargDropListener.java 29 Jun 2006 20:17:22 -0000 1.3
***************
*** 118,126 ****
int answer = JOptionPane.showConfirmDialog(null,
"Move here (NO to merge)? ") ;
if(answer == JOptionPane.YES_OPTION)
{
tree.movePackage(sourcePkg, targetPkg) ;
}
! else
{
// merge two packages
--- 118,127 ----
int answer = JOptionPane.showConfirmDialog(null,
"Move here (NO to merge)? ") ;
+
if(answer == JOptionPane.YES_OPTION)
{
tree.movePackage(sourcePkg, targetPkg) ;
}
! else if(answer == JOptionPane.NO_OPTION)
{
// merge two packages
***************
*** 141,145 ****
--- 142,150 ----
// mark the old package as deleted
sourcePkg.status = ATOTreeNode.DELETED_NODE ;
+
}
+
+
+ // If Cancel is selected, nothing is done
}
}
Index: PackageView.java
===================================================================
RCS file: /cvsroot/cob/COBEditor/src/edu/iastate/ato/gui/packageview/PackageView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PackageView.java 20 Jun 2006 02:38:23 -0000 1.2
--- PackageView.java 29 Jun 2006 20:17:22 -0000 1.3
***************
*** 25,28 ****
--- 25,29 ----
import edu.iastate.ato.tree.PackageNode ;
import edu.iastate.ato.tree.Term2Tree ;
+ import edu.iastate.utils.gui.JStatusBar;
import edu.iastate.utils.lang.*;
***************
*** 164,172 ****
if(e.getClickCount() == 1)
{
! StopWatch w = new StopWatch();
! w.start();
! MOEditor.theInstance.paneDetails.update(selectedNode) ;
! w.stop();
! System.out.println(w.print());
}
else if(e.getClickCount() == 2)
--- 165,192 ----
if(e.getClickCount() == 1)
{
! final JStatusBar statusBar = MOEditor.theInstance.statusBar ;
! Thread t = new Thread()
! {
! public void run()
! {
! int pb = statusBar.addProgressBar(true, 0, 0) ;
! String termOrPackage="";
! if(selectedNode instanceof DbTermNode){
! termOrPackage= "Term";
! }else if(selectedNode instanceof DbTermNode){
! termOrPackage= "Package";
! }
! statusBar.updateProgressBar(pb,"Loading "+termOrPackage+": "+selectedNode.getLocalName());
!
! StopWatch w = new StopWatch();
! w.start();
! MOEditor.theInstance.paneDetails.update(selectedNode) ;
! w.stop();
! System.out.println(w.print());
!
! statusBar.removeProgressBar(pb);
! }
! } ;
! t.start() ;
}
else if(e.getClickCount() == 2)
|
