From: Peter W. <pw...@us...> - 2006-07-26 09:37:40
|
Update of /cvsroot/cob/COBEditor/src/edu/iastate/ato/tree In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv31183/src/edu/iastate/ato/tree Modified Files: ATOTreeNode.java PackageNode.java Log Message: Allows term properties to be deleted. Index: ATOTreeNode.java =================================================================== RCS file: /cvsroot/cob/COBEditor/src/edu/iastate/ato/tree/ATOTreeNode.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ATOTreeNode.java 24 Jun 2006 12:19:25 -0000 1.2 --- ATOTreeNode.java 26 Jul 2006 09:37:30 -0000 1.3 *************** *** 38,41 **** --- 38,42 ---- static public final short DELETED_UPEDGE = 3 ; static public final short MERGED = 4 ; + //static public final short NEW_NODE = 5 ; public String status2string() Index: PackageNode.java =================================================================== RCS file: /cvsroot/cob/COBEditor/src/edu/iastate/ato/tree/PackageNode.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PackageNode.java 29 Jun 2006 22:15:54 -0000 1.2 --- PackageNode.java 26 Jul 2006 09:37:30 -0000 1.3 *************** *** 26,32 **** public class PackageNode extends ATOTreeNode { ! private DbPackage thisPackage ; ! public boolean expanded = false ; public MetaTreeNode obsoleteNodes ; public void markDeleted() --- 26,34 ---- public class PackageNode extends ATOTreeNode { ! private DbPackage thisPackage; ! public boolean expanded = false; public MetaTreeNode obsoleteNodes ; + public boolean editing = false; + public boolean wasEdited = false; public void markDeleted() *************** *** 90,94 **** int max = 200 ; ! public void expand(Connection db, JProgressBar progress) { if(this.status == ATOTreeNode.DELETED_NODE) --- 92,101 ---- int max = 200 ; ! ! public void expand(Connection db, JProgressBar progress){ ! expand(db, progress, true); ! } ! ! public void expand(Connection db, JProgressBar progress, boolean reload) { if(this.status == ATOTreeNode.DELETED_NODE) *************** *** 118,122 **** //}} //String packageName = packageNode.getLocalName(); ! clearPackage() ; updateTermNumber(db) ; --- 125,132 ---- //}} //String packageName = packageNode.getLocalName(); ! if( reload == true ){ ! clearPackage(); ! } ! updateTermNumber(db) ; *************** *** 124,138 **** treeLoader.setProgress(progress) ; ! StopWatch w = new StopWatch() ; ! w.start() ; ! treeLoader.makeDagFromRootsQuick(this, cutoff, true, this) ; ! //treeLoader.makeDagFromRoots(this, cutoff, true, this) ; ! w.stop(); ! System.out.println(w.print()); // make the Obsolete meta node ! int n = OntologyQuerier.getObsoleteTermCount(db, this) ; ! obsoleteNodes = new MetaTreeNode("Obsolete(" + n + ")", null) ; ! this.add(obsoleteNodes) ; // load all obsoleteNodes //treeLoader.addObsoleteTerms(obsoleteNodes, this) ; --- 134,154 ---- treeLoader.setProgress(progress) ; ! if( reload == true ){ ! StopWatch w = new StopWatch() ; ! w.start() ; ! treeLoader.makeDagFromRootsQuick(this, cutoff, true, this) ; ! ! //treeLoader.makeDagFromRoots(this, cutoff, true, this) ; ! w.stop(); ! System.out.println(w.print()); ! } // make the Obsolete meta node ! ! if( reload == true ){ ! int n = OntologyQuerier.getObsoleteTermCount(db, this) ; ! obsoleteNodes = new MetaTreeNode("Obsolete(" + n + ")", null) ; ! this.add(obsoleteNodes) ; ! } // load all obsoleteNodes //treeLoader.addObsoleteTerms(obsoleteNodes, this) ; |