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, 16 Feb 2004 21:00:03 GMT
oberhack    2004/02/16 13:00:03

  Modified:    ide/org.apache.avalon.ide.eclipse.ui plugin.xml
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/operation
                        AbstractGeneratorOperation.java
               ide/org.apache.avalon.ide.eclipse.ui/test/test/org/apache/avalon/ide/eclipse/core/resource
                        AllTests.java ProjectResourceManagerTest.java
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards
                        NewMerlinProjectWizardPage.java WizardUtil.java
                        NewMerlinProjectSelectionPage.java
                        NewProjectWizard.java NewMerlinProjectWizard.java
                        NewMerlinNatureWizard.java
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui
                        MerlinDeveloperUIResources.properties
                        MerlinDeveloperUI.java
               ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools
                        ImageViewerEditor.java
  Added:       ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences
                        MerlinMainPreferencePage.java
  Log:
  ALv2 added
  
  Revision  Changes    Path
  1.5       +8 -0      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.xml	13 Feb 2004 11:45:34 -0000	1.4
  +++ plugin.xml	16 Feb 2004 21:00:02 -0000	1.5
  @@ -61,5 +61,13 @@
               id="Viewer.editors.XMLEditor">
         </editor>
      </extension>
  +   <extension
  +         point="org.eclipse.ui.preferencePages">
  +      <page
  +            name="Merlin Container"
  +            class="org.apache.avalon.ide.eclipse.merlin.preferences.MerlinMainPreferencePage"
  +            id="org.apache.avalon.MerlinMainPreferencePage">
  +      </page>
  +   </extension>
         
   </plugin>
  
  
  
  1.2       +15 -39    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractGeneratorOperation.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ AbstractGeneratorOperation.java	16 Feb 2004 21:00:02 -0000	1.2
  @@ -1,43 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met: 1.
  - * Redistributions of source code must retain the above copyright notice, this
  - * list of conditions and the following disclaimer. 2. Redistributions in
  - * binary form must reproduce the above copyright notice, this list of
  - * conditions and the following disclaimer in the documentation and/or other
  - * materials provided with the distribution. 3. The end-user documentation
  - * included with the redistribution, if any, must include the following
  - * acknowledgment: "This product includes software developed by the Apache
  - * Software Foundation (http://www.apache.org/)." Alternately, this
  - * acknowledgment may appear in the software itself, if and wherever such
  - * third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache
  - * Avalon", "Avalon Framework" and "Apache Software Foundation" must not be
  - * used to endorse or promote products derived from this software without prior
  - * written permission. For written permission, please contact
  - * apache@apache.org. 5. Products derived from this software may not be called
  - * "Apache", nor may "Apache" appear in their name, without prior written
  - * permission of the Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.operation;
   
  
  
  
  1.2       +15 -4     avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/test/test/org/apache/avalon/ide/eclipse/core/resource/AllTests.java
  
  Index: AllTests.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/test/test/org/apache/avalon/ide/eclipse/core/resource/AllTests.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AllTests.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ AllTests.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,8 +1,19 @@
   /*
  - * Created on 03.01.2004
  - *
  - * To change the template for this generated file go to
  - * Window - Preferences - Java - Code Generation - Code and Comments
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package test.org.apache.avalon.ide.eclipse.core.resource;
   
  
  
  
  1.2       +104 -64   avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/test/test/org/apache/avalon/ide/eclipse/core/resource/ProjectResourceManagerTest.java
  
  Index: ProjectResourceManagerTest.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/test/test/org/apache/avalon/ide/eclipse/core/resource/ProjectResourceManagerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProjectResourceManagerTest.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ ProjectResourceManagerTest.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,8 +1,19 @@
   /*
  - * Created on 03.01.2004
  - * 
  - * To change the template for this generated file go to Window - Preferences -
  - * Java - Code Generation - Code and Comments
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package test.org.apache.avalon.ide.eclipse.core.resource;
   
  @@ -11,9 +22,12 @@
   import junit.framework.TestCase;
   
   import org.apache.avalon.ide.eclipse.core.resource.ProjectResourceManager;
  +import org.apache.avalon.ide.eclipse.core.tools.DynProjectParam;
   import org.apache.avalon.ide.eclipse.core.xmlmodel.Directory;
   import org.apache.avalon.ide.eclipse.core.xmlmodel.ProjectModel;
   import org.apache.avalon.ide.eclipse.core.xmlmodel.ProjectModelConfiguration;
  +import org.apache.avalon.ide.eclipse.merlin.launch.MerlinDeveloperLaunch;
  +import org.apache.avalon.ide.eclipse.merlin.nature.MerlinProjectNature;
   import org.apache.avalon.ide.eclipse.merlin.ui.MerlinDeveloperUI;
   
   /**
  @@ -24,18 +38,18 @@
    */
   public class ProjectResourceManagerTest extends TestCase
   {
  -
  +    private static ProjectModelConfiguration projectConfig;
       public static void main(String[] args)
       {
           junit.textui.TestRunner.run(ProjectResourceManagerTest.class);
       }
   
       /*
  -	 * Class to test for void ProjectResourceManager(String, String)
  -	 */
  +     * Class to test for void ProjectResourceManager(String, String)
  +     */
       public void testGetProjectModelConfiguration()
       {
  -        ProjectModelConfiguration projectConfig =
  +        projectConfig =
               ProjectResourceManager.getProjectModelConfiguration(
                   "/properties/NewProjectConfigTest.xcfg",
                   MerlinDeveloperUI.PLUGIN_ID);
  @@ -45,82 +59,108 @@
           {
               // Project 1
               ProjectModel model = (ProjectModel) it.next();
  -            this.assertEquals(
  -                model.getLabel() + "model test1 ",
  -                4,
  -                model.getDirectories().size());
  -                // Directory1
  -                Iterator d = model.getDirectories().iterator();
  -                while (d.hasNext())
  -                {
  -                    Directory dir = (Directory) d.next();
  -                    this.assertEquals(
  -                            dir.getName() + "Directory test1 (api) ",
  -                            0,
  -							dir.getTemplates().size());
  -                    
  -                    dir = (Directory) d.next();
  -                    this.assertEquals(
  -                            dir.getName() + "Directory test2 (impl) ",
  -                            0,
  -                            dir.getTemplates().size());
  -                    
  -                    dir = (Directory) d.next();
  -                    this.assertEquals(
  -                            dir.getName() + "Directory test3 (impl/block-inf) ",
  -                            1,
  -                            dir.getTemplates().size());
  -                    
  -                    dir = (Directory) d.next();
  -                    this.assertEquals(
  -                            dir.getName() + "Directory test4 (test) ",
  -                            0,
  -                            dir.getTemplates().size());
  -                }
  +            this.assertEquals(model.getLabel() + "model test1 ", 4, model.getDirectories().size());
  +            // Directory1
  +            Iterator d = model.getDirectories().iterator();
  +            while (d.hasNext())
  +            {
  +                Directory dir = (Directory) d.next();
  +                this.assertEquals(
  +                    dir.getName() + "Directory test1 (api) ",
  +                    0,
  +                    dir.getTemplates().size());
  +
  +                dir = (Directory) d.next();
  +                this.assertEquals(
  +                    dir.getName() + "Directory test2 (impl) ",
  +                    0,
  +                    dir.getTemplates().size());
  +
  +                dir = (Directory) d.next();
  +                this.assertEquals(
  +                    dir.getName() + "Directory test3 (impl/block-inf) ",
  +                    1,
  +                    dir.getTemplates().size());
  +
  +                dir = (Directory) d.next();
  +                this.assertEquals(
  +                    dir.getName() + "Directory test4 (test) ",
  +                    0,
  +                    dir.getTemplates().size());
  +            }
               // Project2
               model = (ProjectModel) it.next();
  -            this.assertEquals(
  -                model.getLabel() + "model test2 ",
  -                4,
  -                model.getDirectories().size());
  +            this.assertEquals(model.getLabel() + "model test2 ", 4, model.getDirectories().size());
               // Directory1
               d = model.getDirectories().iterator();
               while (d.hasNext())
               {
                   Directory dir = (Directory) d.next();
                   this.assertEquals(
  -                        dir.getName() + "Directory test1 (api) ",
  -                        0,
  -                        dir.getTemplates().size());
  -                
  +                    dir.getName() + "Directory test1 (api) ",
  +                    0,
  +                    dir.getTemplates().size());
  +
                   dir = (Directory) d.next();
                   this.assertEquals(
  -                        dir.getName() + "Directory test2 (impl) ",
  -                        2,
  -                        dir.getTemplates().size());
  -                
  +                    dir.getName() + "Directory test2 (impl) ",
  +                    2,
  +                    dir.getTemplates().size());
  +
                   dir = (Directory) d.next();
                   this.assertEquals(
  -                        dir.getName() + "Directory test3 (impl/block-inf) ",
  -                        1,
  -                        dir.getTemplates().size());
  -                
  +                    dir.getName() + "Directory test3 (impl/block-inf) ",
  +                    1,
  +                    dir.getTemplates().size());
  +
                   dir = (Directory) d.next();
                   this.assertEquals(
  -                        dir.getName() + "Directory test4 (test) ",
  -                        0,
  -                        dir.getTemplates().size());
  +                    dir.getName() + "Directory test4 (test) ",
  +                    0,
  +                    dir.getTemplates().size());
               }
  -            
  +
               // Project3
               model = (ProjectModel) it.next();
  -            this.assertEquals(
  -                model.getLabel() + "model test3 ",
  -                0,
  -                model.getDirectories().size());
  +            this.assertEquals(model.getLabel() + "model test3 ", 0, model.getDirectories().size());
   
           }
           this.assertEquals("project models test", 3, projectConfig.getProjectModels().size());
  +    }
  +/*
  + * Test the creation of a new project
  + */
  +    public void testCreateProject() throws Exception
  +    {
  +        final String projectName = "MerlinTest";
  +        final String nature = MerlinDeveloperLaunch.MERLIN_PROJECT_NATURE_ID;
  +        DynProjectParam param = new DynProjectParam();
  +        param.setProjectName(projectName);
  +        param.setContainerName("m_test");
  +        param.setFullImplementationClassName("tutorial.impl.HelloWorldIml");
  +        param.setFullServiceClassName("tutorial.api.HelloWorld");
  +        param.setVersion("1.0.1");
  +        param.setVirtualServiceName("hello world");
  +
  +        Iterator it = projectConfig.getProjectModels().iterator();
  +        ProjectResourceManager prm = null;
  +
  +        while (it.hasNext())
  +        {
  +            prm =
  +                new ProjectResourceManager(
  +                    (ProjectModel) it.next(),
  +                    param,
  +                    MerlinDeveloperUI.PLUGIN_ID,
  +                    nature);
  +        }
  +
  +        assertEquals("test project name ", prm.getProject().getName(), projectName);
  +        assertEquals(
  +            "test project nature ",
  +            (prm.getProject().getNature(nature) instanceof MerlinProjectNature),
  +            true);
  +
       }
   
   }
  
  
  
  1.2       +15 -40    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectWizardPage.java
  
  Index: NewMerlinProjectWizardPage.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectWizardPage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewMerlinProjectWizardPage.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ NewMerlinProjectWizardPage.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,44 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met:
  - *  1. Redistributions of source code must retain the above copyright notice,
  - * this list of conditions and the following disclaimer.
  - *  2. Redistributions in binary form must reproduce the above copyright
  - * notice, this list of conditions and the following disclaimer in the
  - * documentation and/or other materials provided with the distribution.
  - *  3. The end-user documentation included with the redistribution, if any,
  - * must include the following acknowledgment: "This product includes software
  - * developed by the Apache Software Foundation (http://www.apache.org/)."
  - * Alternately, this acknowledgment may appear in the software itself, if and
  - * wherever such third-party acknowledgments normally appear.
  - *  4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and "Apache
  - * Software Foundation" must not be used to endorse or promote products derived
  - * from this software without prior written permission. For written permission,
  - * please contact apache@apache.org.
  - *  5. Products derived from this software may not be called "Apache", nor may
  - * "Apache" appear in their name, without prior written permission of the
  - * Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +15 -40    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/WizardUtil.java
  
  Index: WizardUtil.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/WizardUtil.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WizardUtil.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ WizardUtil.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,44 +1,19 @@
   /*
  - * 
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met: 1.
  - * Redistributions of source code must retain the above copyright notice, this
  - * list of conditions and the following disclaimer. 2. Redistributions in
  - * binary form must reproduce the above copyright notice, this list of
  - * conditions and the following disclaimer in the documentation and/or other
  - * materials provided with the distribution. 3. The end-user documentation
  - * included with the redistribution, if any, must include the following
  - * acknowledgment: "This product includes software developed by the Apache
  - * Software Foundation (http://www.apache.org/)." Alternately, this
  - * acknowledgment may appear in the software itself, if and wherever such
  - * third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache
  - * Avalon", "Avalon Framework" and "Apache Software Foundation" must not be
  - * used to endorse or promote products derived from this software without prior
  - * written permission. For written permission, please contact
  - * apache@apache.org. 5. Products derived from this software may not be called
  - * "Apache", nor may "Apache" appear in their name, without prior written
  - * permission of the Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +15 -40    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java
  
  Index: NewMerlinProjectSelectionPage.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectSelectionPage.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewMerlinProjectSelectionPage.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ NewMerlinProjectSelectionPage.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,44 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met:
  - *  1. Redistributions of source code must retain the above copyright notice,
  - * this list of conditions and the following disclaimer.
  - *  2. Redistributions in binary form must reproduce the above copyright
  - * notice, this list of conditions and the following disclaimer in the
  - * documentation and/or other materials provided with the distribution.
  - *  3. The end-user documentation included with the redistribution, if any,
  - * must include the following acknowledgment: "This product includes software
  - * developed by the Apache Software Foundation (http://www.apache.org/)."
  - * Alternately, this acknowledgment may appear in the software itself, if and
  - * wherever such third-party acknowledgments normally appear.
  - *  4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and "Apache
  - * Software Foundation" must not be used to endorse or promote products derived
  - * from this software without prior written permission. For written permission,
  - * please contact apache@apache.org.
  - *  5. Products derived from this software may not be called "Apache", nor may
  - * "Apache" appear in their name, without prior written permission of the
  - * Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +15 -39    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewProjectWizard.java
  
  Index: NewProjectWizard.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewProjectWizard.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewProjectWizard.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ NewProjectWizard.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,43 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met: 1.
  - * Redistributions of source code must retain the above copyright notice, this
  - * list of conditions and the following disclaimer. 2. Redistributions in
  - * binary form must reproduce the above copyright notice, this list of
  - * conditions and the following disclaimer in the documentation and/or other
  - * materials provided with the distribution. 3. The end-user documentation
  - * included with the redistribution, if any, must include the following
  - * acknowledgment: "This product includes software developed by the Apache
  - * Software Foundation (http://www.apache.org/)." Alternately, this
  - * acknowledgment may appear in the software itself, if and wherever such
  - * third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache
  - * Avalon", "Avalon Framework" and "Apache Software Foundation" must not be
  - * used to endorse or promote products derived from this software without prior
  - * written permission. For written permission, please contact
  - * apache@apache.org. 5. Products derived from this software may not be called
  - * "Apache", nor may "Apache" appear in their name, without prior written
  - * permission of the Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +15 -39    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectWizard.java
  
  Index: NewMerlinProjectWizard.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinProjectWizard.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewMerlinProjectWizard.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ NewMerlinProjectWizard.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,43 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met: 1.
  - * Redistributions of source code must retain the above copyright notice, this
  - * list of conditions and the following disclaimer. 2. Redistributions in
  - * binary form must reproduce the above copyright notice, this list of
  - * conditions and the following disclaimer in the documentation and/or other
  - * materials provided with the distribution. 3. The end-user documentation
  - * included with the redistribution, if any, must include the following
  - * acknowledgment: "This product includes software developed by the Apache
  - * Software Foundation (http://www.apache.org/)." Alternately, this
  - * acknowledgment may appear in the software itself, if and wherever such
  - * third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache
  - * Avalon", "Avalon Framework" and "Apache Software Foundation" must not be
  - * used to endorse or promote products derived from this software without prior
  - * written permission. For written permission, please contact
  - * apache@apache.org. 5. Products derived from this software may not be called
  - * "Apache", nor may "Apache" appear in their name, without prior written
  - * permission of the Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +15 -40    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinNatureWizard.java
  
  Index: NewMerlinNatureWizard.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/wizards/NewMerlinNatureWizard.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NewMerlinNatureWizard.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ NewMerlinNatureWizard.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,44 +1,19 @@
   /*
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met:
  - *  1. Redistributions of source code must retain the above copyright notice,
  - * this list of conditions and the following disclaimer.
  - *  2. Redistributions in binary form must reproduce the above copyright
  - * notice, this list of conditions and the following disclaimer in the
  - * documentation and/or other materials provided with the distribution.
  - *  3. The end-user documentation included with the redistribution, if any,
  - * must include the following acknowledgment: "This product includes software
  - * developed by the Apache Software Foundation (http://www.apache.org/)."
  - * Alternately, this acknowledgment may appear in the software itself, if and
  - * wherever such third-party acknowledgments normally appear.
  - *  4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and "Apache
  - * Software Foundation" must not be used to endorse or promote products derived
  - * from this software without prior written permission. For written permission,
  - * please contact apache@apache.org.
  - *  5. Products derived from this software may not be called "Apache", nor may
  - * "Apache" appear in their name, without prior written permission of the
  - * Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.wizards;
   
  
  
  
  1.2       +18 -0     avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUIResources.properties
  
  Index: MerlinDeveloperUIResources.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUIResources.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinDeveloperUIResources.properties	26 Jan 2004 11:53:07 -0000	1.1
  +++ MerlinDeveloperUIResources.properties	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,5 +1,23 @@
   #########################################
   #
  +#
  +#   
  +#      Copyright 2004. The Apache Software Foundation.
  +#
  +#   Licensed under the Apache License, Version 2.0 (the "License");
  +#   you may not use this file except in compliance with the License.
  +#   You may obtain a copy of the License at
  +#
  +#       http://www.apache.org/licenses/LICENSE-2.0
  +#
  +#   Unless required by applicable law or agreed to in writing, software
  +#   distributed under the License is distributed on an "AS IS" BASIS,
  +#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +#   See the License for the specific language governing permissions and
  +#   limitations under the License. 
  +#   
  +# */
  +#
   #########################################
   
   new.MerlinDevelopment.window.title=New Merlin Project
  
  
  
  1.2       +15 -40    avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java
  
  Index: MerlinDeveloperUI.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/MerlinDeveloperUI.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MerlinDeveloperUI.java	26 Jan 2004 11:53:07 -0000	1.1
  +++ MerlinDeveloperUI.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,44 +1,19 @@
   /*
  - * 
  - * ============================================================================
  - * The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  - * 
  - * Redistribution and use in source and binary forms, with or without modifica-
  - * tion, are permitted provided that the following conditions are met: 1.
  - * Redistributions of source code must retain the above copyright notice, this
  - * list of conditions and the following disclaimer. 2. Redistributions in
  - * binary form must reproduce the above copyright notice, this list of
  - * conditions and the following disclaimer in the documentation and/or other
  - * materials provided with the distribution. 3. The end-user documentation
  - * included with the redistribution, if any, must include the following
  - * acknowledgment: "This product includes software developed by the Apache
  - * Software Foundation (http://www.apache.org/)." Alternately, this
  - * acknowledgment may appear in the software itself, if and wherever such
  - * third-party acknowledgments normally appear. 4. The names "Jakarta", "Apache
  - * Avalon", "Avalon Framework" and "Apache Software Foundation" must not be
  - * used to endorse or promote products derived from this software without prior
  - * written permission. For written permission, please contact
  - * apache@apache.org. 5. Products derived from this software may not be called
  - * "Apache", nor may "Apache" appear in their name, without prior written
  - * permission of the Apache Software Foundation.
  - * 
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  - * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  - * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  - * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - * 
  - * This software consists of voluntary contributions made by many individuals
  - * on behalf of the Apache Software Foundation. For more information on the
  - * Apache Software Foundation, please see <http://www.apache.org/> .
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
    */
   package org.apache.avalon.ide.eclipse.merlin.ui;
   
  
  
  
  1.2       +18 -0     avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/ImageViewerEditor.java
  
  Index: ImageViewerEditor.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/ui/tools/ImageViewerEditor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ImageViewerEditor.java	13 Feb 2004 11:45:34 -0000	1.1
  +++ ImageViewerEditor.java	16 Feb 2004 21:00:03 -0000	1.2
  @@ -1,3 +1,21 @@
  +/*
  +   
  +      Copyright 2004. The Apache Software Foundation.
  +
  +   Licensed under the Apache License, Version 2.0 (the "License");
  +   you may not use this file except in compliance with the License.
  +   You may obtain a copy of the License at
  +
  +       http://www.apache.org/licenses/LICENSE-2.0
  +
  +   Unless required by applicable law or agreed to in writing, software
  +   distributed under the License is distributed on an "AS IS" BASIS,
  +   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  +   See the License for the specific language governing permissions and
  +   limitations under the License. 
  +   
  + */
  +
   package org.apache.avalon.ide.eclipse.merlin.ui.tools;
   
   import org.eclipse.core.runtime.IProgressMonitor;
  
  
  
  1.1                  avalon-sandbox/ide/org.apache.avalon.ide.eclipse.ui/src/org/apache/avalon/ide/eclipse/merlin/preferences/MerlinMainPreferencePage.java
  
  Index: MerlinMainPreferencePage.java
  ===================================================================
  /*
     
        Copyright 2004. The Apache Software Foundation.
  
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
  
         http://www.apache.org/licenses/LICENSE-2.0
  
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License. 
     
   */
  
  package org.apache.avalon.ide.eclipse.merlin.preferences;
  
  
  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;
  import org.eclipse.swt.layout.GridLayout;
  import org.eclipse.swt.widgets.Button;
  import org.eclipse.swt.widgets.Composite;
  import org.eclipse.swt.widgets.Control;
  import org.eclipse.swt.widgets.Group;
  import org.eclipse.swt.widgets.Label;
  import org.eclipse.swt.widgets.Text;
  import org.eclipse.ui.IWorkbench;
  import org.eclipse.ui.IWorkbenchPreferencePage;
  
  
  public class MerlinMainPreferencePage
  	extends PreferencePage
  	implements IWorkbenchPreferencePage {
  
  	public MerlinMainPreferencePage() {
  		super();
  		setPreferenceStore(MerlinDeveloperUI.getDefault().getPreferenceStore());
  		setDescription("General settings for Merlin Container");
  		initializeDefaults();
  	}
  /**
   * Sets the default values of the preferences.
   */
  	private void initializeDefaults() {
  		IPreferenceStore store = getPreferenceStore();
  	}
  	
  	public Control createContents(Composite pParent){
          
          Composite area = new Composite(pParent, SWT.NONE);
          area.setLayoutData(new GridData(GridData.FILL_BOTH));
          final GridLayout gridLayout_1 = new GridLayout();
          gridLayout_1.verticalSpacing = 15;
          area.setLayout(gridLayout_1);
          {
              final Group group = new Group(area, SWT.NONE);
              group.setText("Installation Properties");
              group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
              final GridLayout gridLayout = new GridLayout();
              gridLayout.numColumns = 3;
              group.setLayout(gridLayout);
              
              {
                  final Label label = new Label(group, SWT.NONE);
                  label.setText("Merlin Insallation Directory:");
              }
              {
                  final Text text = new Text(group, SWT.BORDER);
                  text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
              }
              {
                  final Button button = new Button(group, SWT.NONE);
                  button.setText("browse");
              }
              {
                  final Label label = new Label(group, SWT.NONE);
                  label.setText("Merlin Configuration Directory:");
              }
              {
                  final Text text = new Text(group, SWT.BORDER);
                  text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
              }
              {
                  final Button button = new Button(group, SWT.NONE);
                  button.setText("browse");
              }
              {
                  final Label label = new Label(group, SWT.NONE);
                  label.setText("Kernel Configuration File:");
              }
              {
                  final Text text = new Text(group, SWT.BORDER);
                  text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
              }
              {
                  final Button button = new Button(group, SWT.NONE);
                  button.setText("browse");
              }
              {
                  final Label label = new Label(group, SWT.NONE);
                  label.setText("System Repository:");
              }
              {
                  final Text text = new Text(group, SWT.BORDER);
                  text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
              }
              {
                  final Button button = new Button(group, SWT.NONE);
                  button.setText("browse");
              }
              {
                  final Label label = new Label(group, SWT.NONE);
                  label.setText("Application Repository:");
              }
              {
                  final Text text = new Text(group, SWT.BORDER);
                  text.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
              }
              {
                  final Button button = new Button(group, SWT.NONE);
                  button.setText("browse");
              }
          }
          {
          	final Group group = new Group(area, SWT.NONE);
          	group.setText("User Properties");
          	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
          	final GridLayout gridLayout = new GridLayout();
          	gridLayout.numColumns = 3;
          	group.setLayout(gridLayout);
          }
          {
          	final Group group = new Group(area, SWT.NONE);
          	group.setText("System Properties");
          	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
          	final GridLayout gridLayout = new GridLayout();
          	gridLayout.numColumns = 3;
          	group.setLayout(gridLayout);
          }
          {
              final Group group = new Group(area, SWT.NONE);
              group.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
              group.setText("Standard Properties");
              final GridLayout gridLayout = new GridLayout();
              group.setLayout(gridLayout);
              {
                  final Button button = new Button(group, SWT.CHECK);
                  button.setText("Show Infoheader at Startup");
              }
              {
                  final Button button = new Button(group, SWT.CHECK);
                  button.setText("Show Debug Informations");
              }
              {
                  final Button button = new Button(group, SWT.CHECK);
                  button.setText("Start Server as permanent Task");
              }
          }
          
          return null;
      }
  	public void init(IWorkbench workbench) {
  	}
  }
  
  

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


Mime
View raw message