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

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2011-04-26 15:58:55 -0400 (Tue, 26 Apr 2011)
New Revision: 30851

Modified:
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java
   trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/launching/ForgeRuntime.java
Log:
- make the plugin work with the 'new' forge (without seam)
- startup forge with forge.compatibility.IDE=true to make it also work on Windows

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java	2011-04-26 19:14:11 UTC (rev 30850)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/CommandRecorder.java	2011-04-26 19:58:55 UTC (rev 30851)
@@ -82,6 +82,8 @@
 			String projectDirName = projectPath.substring(index + 1);
 			String projectBaseDirPath = projectPath.substring(0, index);
 			new ProjectImporter(projectBaseDirPath, projectDirName).importProject();
+		} else {
+			
 		}
 	}
 

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java	2011-04-26 19:14:11 UTC (rev 30850)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/console/Console.java	2011-04-26 19:58:55 UTC (rev 30851)
@@ -162,13 +162,14 @@
 									escapeSequence.setLength(0);
 									lastLineLength = columnNumber - 1;
 									escapeSequenceStarted = false;
-								}
-								if (c == 'K') {
+								} else if (c == 'K') {
 									int doclength = getDocument().getLength();
 									int currentPosition = lastLinePosition + lastLineLength;									
 									getDocument().replace(currentPosition, doclength - currentPosition, "");
 									escapeSequenceStarted = false;
-								}
+//								} else if (c == 'm') {
+//									
+								} 
 							} else {
 								escapeSequence.append(c);
 							}

Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/launching/ForgeRuntime.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/launching/ForgeRuntime.java	2011-04-26 19:14:11 UTC (rev 30850)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/launching/ForgeRuntime.java	2011-04-26 19:58:55 UTC (rev 30851)
@@ -237,8 +237,8 @@
 						break;
 					}
 				}
-				ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "Seam Forge");
-				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.jboss.seam.forge.shell.Bootstrap");
+				ILaunchConfigurationWorkingCopy workingCopy = type.newInstance(null, "Forge");
+				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.jboss.forge.shell.Bootstrap");
 				List<String> classpath = new ArrayList<String>();
 //				Bundle bundle = Platform.getBundle("org.jboss.tools.seam.forge");
 				File file = null;
@@ -291,6 +291,7 @@
 				File workingDir = path.toFile();
 				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, workingDir.getAbsolutePath());
 //				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dseam.forge.shell.colorEnabled=true");
+				workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "-Dforge.compatibility.IDE=true");
 				ILaunchConfiguration configuration = workingCopy.doSave();
 				ILaunch launch = configuration.launch(ILaunchManager.RUN_MODE, null, false, false);
 				IProcess[] processes = launch.getProcesses();