You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by jo...@apache.org on 2011/08/03 09:13:46 UTC

svn commit: r1153367 - /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java

Author: joern
Date: Wed Aug  3 07:13:45 2011
New Revision: 1153367

URL: http://svn.apache.org/viewvc?rev=1153367&view=rev
Log:
UIMA-2195 Applied patch to comment a constant which does not exist in eclipse 3.7

Modified:
    uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java

Modified: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java?rev=1153367&r1=1153366&r2=1153367&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java (original)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/src/main/java/org/apache/uima/tm/dltk/internal/debug/ui/launchConfigurations/TextMarkerCommonTab.java Wed Aug  3 07:13:45 2011
@@ -8,6 +8,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchingPlugin;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
@@ -74,8 +75,6 @@ import org.eclipse.ui.model.WorkbenchCon
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.views.navigator.ResourceSorter;
 
-import org.apache.uima.tm.dltk.textmarker.launching.TextMarkerLaunchingPlugin;
-
 /**
  * Launch configuration tab used to specify the location a launch configuration is stored in,
  * whether it should appear in the favorites list, and perspective switching behavior for an
@@ -171,8 +170,8 @@ public class TextMarkerCommonTab extends
   public void createControl(Composite parent) {
     Composite comp = new Composite(parent, SWT.NONE);
     setControl(comp);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(),
-            IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
+    PlatformUI.getWorkbench().getHelpSystem()
+            .setHelp(getControl(), IDebugHelpContextIds.LAUNCH_CONFIGURATION_DIALOG_COMMON_TAB);
     comp.setLayout(new GridLayout(2, true));
     comp.setFont(parent.getFont());
 
@@ -248,8 +247,8 @@ public class TextMarkerCommonTab extends
   /**
    * Creates the component set for the capture output composite
    * 
-   * @param data.parent
-   *          the parent to add this component to
+   * @param data
+   *          .parent the parent to add this component to
    */
 
   private void test() {
@@ -780,7 +779,8 @@ public class TextMarkerCommonTab extends
   private boolean validateEncoding() {
     if (fAltEncodingButton.getSelection()) {
       if (fEncodingCombo.getSelectionIndex() == -1) {
-        setErrorMessage(LaunchConfigurationsMessages.CommonTab_No_Encoding_Selected);
+        // TODO constant was removed in Eclipse 3.7, find a substitute
+        // setErrorMessage(LaunchConfigurationsMessages.CommonTab_No_Encoding_Selected);
         return false;
       }
     }
@@ -878,8 +878,8 @@ public class TextMarkerCommonTab extends
     if (fUseDltkRadio.getSelection()) {
       configuration.setAttribute(DebugPlugin.ATTR_CAPTURE_OUTPUT, (String) null);
 
-      configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_DLTK_CONSOLE_ID, Long
-              .toString(System.currentTimeMillis()));
+      configuration.setAttribute(ScriptLaunchConfigurationConstants.ATTR_DLTK_CONSOLE_ID,
+              Long.toString(System.currentTimeMillis()));
       IFileHandle proxyFile;
       try {
         IExecutionEnvironment exeEnv = (IExecutionEnvironment) EnvironmentManager