diff --git a/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java b/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java index 4afb4359..7e34d6b3 100644 --- a/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java +++ b/trunk/siprp/medicina/processo/estrutura/EstruturaProcessoPanel.java @@ -15,6 +15,7 @@ import java.awt.*; import java.text.DateFormat; import java.util.Arrays; import java.util.Date; +import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; import java.util.Vector; @@ -299,7 +300,6 @@ public class EstruturaProcessoPanel extends JPanel ids.put( ProcessoEvent.TIPO_MAIL, id ); } } - System.out.println( ids ); ProcessoEvent event = new ProcessoEvent( this, tipo, ids ); for( int n = 0; n < PROCESSO_LISTENERS.size(); n++ ) { @@ -347,6 +347,7 @@ public class EstruturaProcessoPanel extends JPanel throws Exception { TreePath path = mainTree.getSelectionPath(); + Enumeration expandedDescendants = mainTree.getExpandedDescendants( path ); ProcessoMutableTreeNode processoNode = ( ProcessoMutableTreeNode ) path.getPathComponent( 1 ); boolean vazio = processoNode.getID().intValue() == -1; loadProcesso( id, processoNode ); @@ -357,12 +358,18 @@ public class EstruturaProcessoPanel extends JPanel rootNode.insert( novo, 0 ); ( ( DefaultTreeModel ) mainTree.getModel() ).nodesWereInserted( rootNode, new int[]{ 0 } ) ; } + mainTree.expandPath( path ); +// while( expandedDescendants.hasMoreElements() ) +// { +// mainTree.expandPath( expandedDescendants.nextElement() ); +// } } public void actualizarMarcacaoEscolhida( Integer processoID, Integer marcacaoID ) throws Exception { TreePath path = mainTree.getSelectionPath(); + Enumeration expandedDescendants = mainTree.getExpandedDescendants( path ); ProcessoMutableTreeNode processoNode = ( ProcessoMutableTreeNode ) path.getPathComponent( 1 ); int countOld = processoNode.getChildCount(); actualizarProcessoEscolhido( processoID ); @@ -371,6 +378,12 @@ public class EstruturaProcessoPanel extends JPanel { ( ( DefaultTreeModel ) mainTree.getModel() ).nodesWereInserted( processoNode, new int[]{ countOld } ) ; } + mainTree.expandPath( path ); +// mainTree.expandPath( path ); +// while( expandedDescendants.hasMoreElements() ) +// { +// mainTree.expandPath( expandedDescendants.nextElement() ); +// } // TreePath path = mainTree.getSelectionPath(); // MarcacaoMutableTreeNode processoNode = ( ProcessoMutableTreeNode ) path.getPathComponent( 1 ); // boolean vazio = processoNode.getID().intValue() == -1;