[jbosstools-commits] JBoss Tools SVN: r31143 - in trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge: old and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2011-05-07 08:44:01 -0400 (Sat, 07 May 2011)
New Revision: 31143

Modified:
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java
Log:
- update to 3.7M7 
- suppress the warnings in the org.jboss.tools.seam.forge.old package

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java	2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/importer/ProjectImporter.java	2011-05-07 12:44:01 UTC (rev 31143)
@@ -12,7 +12,6 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
 import org.eclipse.m2e.core.project.MavenProjectInfo;
 import org.eclipse.m2e.core.project.ProjectImportConfiguration;
 
@@ -28,11 +27,10 @@
 	}
 	
 	public void importProject() {		
-		final MavenPlugin mavenPlugin = MavenPlugin.getDefault();
 	    Job job = new WorkspaceJob("Importing Forge project") {
 	        public IStatus runInWorkspace(IProgressMonitor monitor) {
 	          try {
-	        	  mavenPlugin.getProjectConfigurationManager().importProjects(
+	        	  MavenPlugin.getProjectConfigurationManager().importProjects(
 	        			  getProjectToImport(), 
 	        			  new ProjectImportConfiguration(), 
 	        			  monitor);
@@ -42,7 +40,7 @@
 	          return Status.OK_STATUS;
 	        }
 	      };
-	      job.setRule(mavenPlugin.getProjectConfigurationManager().getRule());
+	      job.setRule(MavenPlugin.getProjectConfigurationManager().getRule());
 	      job.schedule();
 	}
 	
@@ -50,9 +48,9 @@
 		MavenProjectInfo result = null;
 		try {
 			File projectDir = new File(baseDirPath, projectName);
-			File pomFile = new File(projectDir, IMavenConstants.POM_FILE_NAME);
-			Model model = MavenPlugin.getDefault().getMavenModelManager().readMavenModel(pomFile);
-			String pomName = projectName + "/" + IMavenConstants.POM_FILE_NAME;
+			File pomFile = new File(projectDir, "pom.xml");
+			Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile);
+			String pomName = projectName + "/" + "pom.xml";
 			result = new MavenProjectInfo(pomName, pomFile, model, null);
 		} catch (CoreException e) {
 			

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java	2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartition.java	2011-05-07 12:44:01 UTC (rev 31143)
@@ -26,7 +26,8 @@
      * Only one of inputStream or outputStream will be null depending on the partitions type.
      */
     private ConsoleOutputStream outputStream;
-    private ConsoleInputStream inputStream;
+    @SuppressWarnings("unused")
+	private ConsoleInputStream inputStream;
     private int length;
     
     /**

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java	2011-05-07 01:14:25 UTC (rev 31142)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/old/ConsolePartitioner.java	2011-05-07 12:44:01 UTC (rev 31143)
@@ -33,6 +33,7 @@
  * @since 3.1
  *
  */
+ at SuppressWarnings(value = { "rawtypes", "unchecked" })
 public class ConsolePartitioner implements IConsoleDocumentPartitioner, IDocumentPartitionerExtension {
 	
 	private PendingPartition consoleClosedPartition;
@@ -74,6 +75,7 @@
 	/**
 	 * An array of legal line delimiters
 	 */
+	@SuppressWarnings("unused")
 	private String[] lld;
 	private int highWaterMark = -1;
 	private int lowWaterMark = -1;