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.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences MerlinMainPreferencePage.java
Date Mon, 29 Mar 2004 18:50:54 GMT
oberhack    2004/03/29 10:50:54

  Modified:    ide/org.apache.avalon.ide.eclipse.ui plugin.xml
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools
                        ExampleBuilder.java
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/operation
                        AbstractGeneratorOperation.java
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences
                        MerlinMainPreferencePage.java
  Log:
  
  
  Revision  Changes    Path
  1.7       +3 -5      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/plugin.xml
  
  Index: plugin.xml
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/plugin.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- plugin.xml	2 Mar 2004 12:26:20 -0000	1.6
  +++ plugin.xml	29 Mar 2004 18:50:53 -0000	1.7
  @@ -22,11 +22,10 @@
         <import plugin="org.apache.avalon.MerlinDeveloperCore"/>
         <import plugin="org.apache.avalon.MerlinDeveloperLaunch"/>
         <import plugin="org.eclipse.jface.text"/>
  -      <import plugin="org.eclipse.ui.workbench.texteditor"/>
  -      <import plugin="org.eclipse.ui.editors"/>
         <import plugin="org.eclipse.jdt.ui"/>
      </requires>
   
  +
      <extension
            point="org.eclipse.jdt.ui.javadocCompletionProcessor">
         <javadocCompletionProcessor
  @@ -35,7 +34,6 @@
               id="avalonJavadocProcessor">
         </javadocCompletionProcessor>
      </extension>
  -
      <extension
            point="org.eclipse.ui.newWizards">
         <category
  @@ -62,8 +60,8 @@
            point="org.eclipse.ui.editors">
         <editor
               name="Image Viewer"
  -            icon="icons/sample.gif"
               extensions="jpg, gif"
  +            icon="icons/sample.gif"
               class="org.apache.avalon.ide.eclipse.merlin.ui.tools.ImageViewerEditor"
               id="Viewer.editors.XMLEditor">
         </editor>
  @@ -71,7 +69,7 @@
      <extension
            point="org.eclipse.ui.preferencePages">
         <page
  -            name="Merlin Container"
  +            name="MerlinDeveloper"
               class="org.apache.avalon.ide.eclipse.merlin.preferences.MerlinMainPreferencePage"
               id="org.apache.avalon.MerlinMainPreferencePage">
         </page>
  
  
  
  1.2       +0 -1      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/ExampleBuilder.java
  
  Index: ExampleBuilder.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/ExampleBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExampleBuilder.java	2 Mar 2004 12:26:20 -0000	1.1
  +++ ExampleBuilder.java	29 Mar 2004 18:50:53 -0000	1.2
  @@ -49,7 +49,6 @@
        */
       protected IProject[] build(int pKind, Map pArgs, IProgressMonitor pMonitor) throws
CoreException
       {
  -        Object obj = getDelta(getProject());
           System.out.println("here");
           // TODO Auto-generated method stub
           return null;
  
  
  
  1.4       +2 -2      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/operation/AbstractGeneratorOperation.java
  
  Index: AbstractGeneratorOperation.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/operation/AbstractGeneratorOperation.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractGeneratorOperation.java	2 Mar 2004 12:26:20 -0000	1.3
  +++ AbstractGeneratorOperation.java	29 Mar 2004 18:50:53 -0000	1.4
  @@ -64,13 +64,13 @@
           {
               monitor.beginTask(MerlinDeveloperUI.getResourceString("NewWebAppProjectOperation.createWebAppTask.description"),
1); //$NON-NLS-1$
   
  -            ProjectResourceManager prm = new ProjectResourceManager(
  +            new ProjectResourceManager(
                   projectModel,
                   pParam,
                   MerlinDeveloperUI.PLUGIN_ID,
                   MerlinDeveloperLaunch.MERLIN_PROJECT_NATURE_ID);
               
  -            prm.addBuilder(MerlinDeveloperLaunch.MERLIN_BUILDER_ID);
  +            //prm.addBuilder(MerlinDeveloperLaunch.MERLIN_BUILDER_ID);
   
           } finally
           {
  
  
  
  1.3       +1 -2      avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences/MerlinMainPreferencePage.java
  
  Index: MerlinMainPreferencePage.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences/MerlinMainPreferencePage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MerlinMainPreferencePage.java	2 Mar 2004 12:26:20 -0000	1.2
  +++ MerlinMainPreferencePage.java	29 Mar 2004 18:50:53 -0000	1.3
  @@ -21,7 +21,6 @@
   
   import org.apache.avalon.ide.eclipse.merlin.launch.container.MerlinContainerEnvironment;
   import org.apache.avalon.ide.eclipse.merlin.ui.MerlinDeveloperUI;
  -import org.eclipse.jface.preference.IPreferenceStore;
   import org.eclipse.jface.preference.PreferencePage;
   import org.eclipse.swt.SWT;
   import org.eclipse.swt.layout.GridData;
  @@ -52,7 +51,7 @@
    * Sets the default values of the preferences.
    */
   	private void initializeDefaults() {
  -		IPreferenceStore store = getPreferenceStore();
  +
   	}
   	
   	public Control createContents(Composite pParent){
  
  
  

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


Mime
View raw message