[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/15 09:52:03

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers  
                        PackagesPublisher.java JstPackagesPublisher.java
  Log:
  Further updates to integrating with packaging. Still not entirely complete. 
  
  Revision  Changes    Path
  1.7       +0 -25     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PackagesPublisher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackagesPublisher.java	11 Jan 2007 15:53:12 -0000	1.6
  +++ PackagesPublisher.java	15 Feb 2007 14:52:03 -0000	1.7
  @@ -39,7 +39,6 @@
   import org.jboss.ide.eclipse.as.core.model.EventLogModel;
   import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogRoot;
   import org.jboss.ide.eclipse.as.core.model.EventLogModel.EventLogTreeItem;
  -import org.jboss.ide.eclipse.as.core.model.PackagesBuildListener.PackagesPublisherBuildListener;
   import org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer;
   import org.jboss.ide.eclipse.as.core.util.FileUtil;
   import org.jboss.ide.eclipse.as.core.util.SimpleTreeItem;
  @@ -251,28 +250,4 @@
   			setProperty(BUILD_TYPE, new Integer(type));
   		}
   	}
  -
  -	
  -	
  -	/*
  -	 * Build events and stuff
  -	 */
  -	
  -	public static final String PREFERENCE_KEY_LISTEN_FOR_BUILD_EVENTS = 
  -		"org.jboss.ide.eclipse.as.core.publishers.PackagesPublisher.ListenForBuildEventsPreferenceKey";
  -	protected boolean getListenForBuildEvents() {
  -		Preferences prefs = JBossServerCorePlugin.getDefault().getPluginPreferences();
  -		if( prefs.contains(PREFERENCE_KEY_LISTEN_FOR_BUILD_EVENTS) )
  -			return prefs.getBoolean(PREFERENCE_KEY_LISTEN_FOR_BUILD_EVENTS);
  -		return true;
  -	}
  -	
  -	protected IPackagesBuildListener addBuildListener(EventLogTreeItem parent) {
  -			IPackagesBuildListener buildListener = new PackagesPublisherBuildListener(parent);
  -			PackagesCore.addPackagesBuildListener(buildListener);
  -		return buildListener;
  -	}
  -	protected void removeBuildListener(IPackagesBuildListener buildListener) {
  -		PackagesCore.removePackagesBuildListener(buildListener);
  -	}
   }
  
  
  
  1.7       +1 -4      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPackagesPublisher.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JstPackagesPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPackagesPublisher.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- JstPackagesPublisher.java	9 Feb 2007 18:22:53 -0000	1.6
  +++ JstPackagesPublisher.java	15 Feb 2007 14:52:03 -0000	1.7
  @@ -75,15 +75,12 @@
   		EventLogModel.markChanged(eventRoot);
   		IPackage topLevel = createTopPackage(module[0], jbServer.getDeployDirectory(), monitor);
   		if( topLevel != null ) {
  -			IPackagesBuildListener listener = null;
  -			if( getListenForBuildEvents()) listener = addBuildListener(event);
   			Throwable t = null;
   			try {
   				PackagesCore.buildPackage(topLevel, new NullProgressMonitor());
   			} catch( Exception e ) {
   				t = e;
   			}
  -			if( getListenForBuildEvents()) removeBuildListener(listener);
   
   			addMoveEvent(event, topLevel, topLevel.isDestinationInWorkspace(), 
   					topLevel.getPackageFilePath(), topLevel.getPackageFilePath(), t);
  @@ -122,7 +119,7 @@
   		IPackageType type = ModulePackageTypeConverter.getPackageTypeFor(module);
   		if( type != null ) {
       		IPackage topLevel = type.createDefaultConfiguration(module.getProject(), monitor);
  -    		topLevel.setDestinationFolder(new Path(deployDir));
  +    		topLevel.setDestinationPath(new Path(deployDir));
       		//topLevel.setDestinationFolder(new Path("c:\\test"));
       		return topLevel;
   		}