avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oberh...@apache.org
Subject cvs commit: avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/ui MerlinServerTabGroup.java
Date Mon, 02 Feb 2004 20:16:30 GMT
oberhack    2004/02/02 12:16:30

  Modified:    ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch
                        MerlinLaunchShortcut.java
               ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container
                        AvalonContainer.java MerlinExternalContainer.java
               ide/org.apache.avalon.ide.eclipse.launch plugin.xml
               ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/ui
                        MerlinServerTabGroup.java
  Log:
  bugfixes
  
  Revision  Changes    Path
  1.2       +3 -2      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinLaunchShortcut.java
  
  Index: MerlinLaunchShortcut.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/MerlinLaunchShortcut.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinLaunchShortcut.java	26 Jan 2004 11:27:12 -0000	1.1
  +++ MerlinLaunchShortcut.java	2 Feb 2004 20:16:30 -0000	1.2
  @@ -154,7 +154,7 @@
           List candidateConfigs = Collections.EMPTY_LIST;
           try
           {
  -            ILaunchConfiguration[] configs =
  +            ILaunchConfiguration[] configs = 
                   DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configType);
               candidateConfigs = new ArrayList(configs.length);
               for (int i = 0; i < configs.length; i++)
  @@ -162,7 +162,8 @@
                   ILaunchConfiguration config = configs[i];
                   if (config
                       .getAttribute(MerlinDeveloperLaunch.ATTR_MERLIN_CONTAINER_ID, "")
  -                    .equals(MerlinExternalContainer.getServerLabel()))
  +                    .equals(MerlinExternalContainer.getServerLabel())
  +                    && (config.getName().equals(project.getProject().getName())))
                   { //$NON-NLS-1$
                       candidateConfigs.add(config);
                   }
  
  
  
  1.2       +1 -0      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/AvalonContainer.java
  
  Index: AvalonContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/AvalonContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AvalonContainer.java	26 Jan 2004 11:27:16 -0000	1.1
  +++ AvalonContainer.java	2 Feb 2004 20:16:30 -0000	1.2
  @@ -119,6 +119,7 @@
               IDebugUIConstants.ATTR_TARGET_DEBUG_PERSPECTIVE,
               IDebugUIConstants.PERSPECTIVE_DEFAULT);
           launch.setAttribute("project", getProjectName());
  +        working.doSave();
   
           // Check Tools classpath
           if (getToolsLibraryLocation() == null)
  
  
  
  1.2       +5 -3      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinExternalContainer.java
  
  Index: MerlinExternalContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/container/MerlinExternalContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinExternalContainer.java	26 Jan 2004 11:27:17 -0000	1.1
  +++ MerlinExternalContainer.java	2 Feb 2004 20:16:30 -0000	1.2
  @@ -129,18 +129,20 @@
       protected String getProgramArguments()
       {
   
  -        String param = "";
  +        StringBuffer param = new StringBuffer();
           try
           {
               IProject project =
                   MerlinDeveloperLaunch.getWorkspace().getRoot().getProject(projectName);
               IJavaProject proj = JavaCore.create(project);
  -            param = project.getLocation().append(proj.getOutputLocation().lastSegment()).toString();
  +            param.append('"');
  +            param.append(project.getLocation().append(proj.getOutputLocation().lastSegment()).toString());
  +            param.append('"');
           } catch (JavaModelException e)
           {
               e.printStackTrace();
           }
  -        return param + " -execute -debug";
  +        return param.toString() + " -execute -debug";
       }
   
       /*
  
  
  
  1.2       +1 -1      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml
  
  Index: plugin.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/plugin.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.xml	26 Jan 2004 11:27:12 -0000	1.1
  +++ plugin.xml	2 Feb 2004 20:16:30 -0000	1.2
  @@ -2,7 +2,7 @@
   <plugin
      id="org.apache.avalon.MerlinDeveloperLaunch"
      name="MerlinDeveloper Launch"
  -   version="0.0.1"
  +   version="0.0.2"
      provider-name="Apache Software Foundation"
      class="org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunch">
   
  
  
  
  1.2       +1 -2      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/ui/MerlinServerTabGroup.java
  
  Index: MerlinServerTabGroup.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.launch/src/org/apache/avalon/ide/eclipse/merlin/launch/ui/MerlinServerTabGroup.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinServerTabGroup.java	26 Jan 2004 11:27:18 -0000	1.1
  +++ MerlinServerTabGroup.java	2 Feb 2004 20:16:30 -0000	1.2
  @@ -49,7 +49,6 @@
   import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
   import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
   import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
  -import org.eclipse.jdt.debug.ui.launchConfigurations.JavaMainTab;
   import org.eclipse.jdt.debug.ui.launchConfigurations.JavaSourceLookupTab;
   
   /**
  @@ -64,7 +63,7 @@
       {
           ILaunchConfigurationTab[] tabs =
               new ILaunchConfigurationTab[] {
  -                new JavaMainTab(),
  +                //new JavaMainTab(),
                   new JavaArgumentsTab(),
                   new JavaJRETab(),
                   new JavaClasspathTab(),
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message