[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb ...

[Marshall Culpepper]

  User: mculpepper
  Date: 07/02/16 14:38:54

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb 
                        XMLBinding.java
  Log:
  [JBIDE-442] moved JBossXB initialization to plugin startup. initial unmarshal loading time is now nearly instant.
  
  Revision  Changes    Path
  1.3       +14 -10    jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XMLBinding.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: XMLBinding.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XMLBinding.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- XMLBinding.java	15 Nov 2006 03:36:31 -0000	1.2
  +++ XMLBinding.java	16 Feb 2007 19:38:54 -0000	1.3
  @@ -42,16 +42,29 @@
   
   public class XMLBinding {
   	
  -	public static final int NUM_UNMARSHAL_MONITOR_STEPS = 4;
  +	public static final int NUM_UNMARSHAL_MONITOR_STEPS = 3;
   	public static final int NUM_MARSHALL_MONITOR_STEPS = 2;
   	
   	private static URL schema = PackagesCorePlugin.getDefault().getBundle().getEntry("xml/packages.xsd");
   	private static URL log4jxml = PackagesCorePlugin.getDefault().getBundle().getEntry("log4j.xml");
  +	private static SchemaBinding binding;
   	
   	static {
   		System.setProperty("log4j.configuration", log4jxml.toString());
   	}
   	
  +	public static void init ()
  +	{
  +		try {
  +			InputStream stream = schema.openStream();
  +			binding = XsdBinder.bind(stream, "UTF-8", null);
  +
  +			stream.close();
  +		} catch (IOException e) {
  +			Trace.trace(XMLBinding.class, e);
  +		}
  +	}
  +	
   	private static void binderSandbox (Runnable runnable)
   	{
   		ClassLoader original = Thread.currentThread().getContextClassLoader();
  @@ -70,10 +83,6 @@
   		binderSandbox(new Runnable() {
   			public void run ()  {
   				try {	
  -					InputStream stream = schema.openStream();
  -					monitor.worked(1);
  -					
  -					SchemaBinding binding = XsdBinder.bind(stream, "UTF-8", null);
   					Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
   					monitor.worked(1);
   					
  @@ -81,13 +90,8 @@
   					monitor.worked(1);
   					
   					element = (XbPackages) xmlObject;
  -					
  -					stream.close();
  -					
   					monitor.worked(1);
   					
  -				} catch (IOException e) {
  -					Trace.trace(XMLBinding.class, e);
   				} catch (JBossXBException e) {
   					Trace.trace(XMLBinding.class, e);
   				}