niclas      2003/12/02 02:19:05

  Modified:    ide/org.apache.avalon.ide.repository.testrepo plugin.xml
               
ide/org.apache.avalon.ide.repository.testrepo/src/java/org/apache/avalon/ide/repository/testrepo
                        TestrepoPlugin.java
  Added:       ide/org.apache.avalon.ide.repository.testrepo .project
                        .classpath
  Log:
  Consolidating the many changes.
  
  Revision  Changes    Path
  1.2       +1 -0      
avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/plugin.xml
  
  Index: plugin.xml
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/plugin.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- plugin.xml        1 Dec 2003 14:16:21 -0000       1.1
  +++ plugin.xml        2 Dec 2003 10:19:05 -0000       1.2
  @@ -14,6 +14,7 @@
      <requires>
         <import plugin="org.eclipse.core.resources"/>
         <import plugin="org.eclipse.ui"/>
  +      <import plugin="org.apache.avalon.ide.eclipse.repository"/>
      </requires>
   
   
  
  
  
  1.1                  
avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/.project
  
  Index: .project
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <projectDescription>
        <name>org.apache.avalon.ide.repository.testrepo</name>
        <comment></comment>
        <projects>
                <project>org.apache.avalon.ide.eclipse.repository</project>
                <project>org.apache.avalon.ide.repository</project>
        </projects>
        <buildSpec>
                <buildCommand>
                        <name>org.eclipse.jdt.core.javabuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
                <buildCommand>
                        <name>org.eclipse.pde.ManifestBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
                <buildCommand>
                        <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.pde.PluginNature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
  </projectDescription>
  
  
  
  1.1                  
avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/.classpath
  
  Index: .classpath
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.core.resources_3.0.0/resources.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.resources_3.0.0/resourcessrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.ui_3.0.0/ui.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui_3.0.0/uisrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swtsrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pi.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-pisrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozilla.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_LINUX_GTK_X86_SRC/org.eclipse.swt.gtk_3.0.0/ws/gtk/swt-mozillasrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.text_3.0.0/text.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.text_3.0.0/textsrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.jface_3.0.0/jface.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface_3.0.0/jfacesrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.jface.text_3.0.0/jfacetext.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.jface.text_3.0.0/jfacetextsrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.ui.views_3.0.0/views.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.views_3.0.0/viewssrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench_3.0.0/workbench.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench_3.0.0/workbenchsrc.zip"/>
      <classpathentry kind="var"
          
path="ECLIPSE_HOME/plugins/org.eclipse.ui.workbench.texteditor_3.0.0/texteditor.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.workbench.texteditor_3.0.0/texteditorsrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.ui.editors_3.0.0/editors.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.ui.editors_3.0.0/editorssrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_3.0.0/boot.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_3.0.0/bootsrc.zip"/>
      <classpathentry kind="var"
          path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_3.0.0/runtime.jar" 
sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_3.0.0/runtimesrc.zip"/>
      <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
      <classpathentry exported="true" kind="src" 
path="/org.apache.avalon.ide.repository"/>
      <classpathentry kind="src" path="src/java"/>
      <classpathentry exported="true" kind="src" 
path="/org.apache.avalon.ide.eclipse.repository"/>
      <classpathentry kind="output" path="build"/>
  </classpath>
  
  
  
  1.2       +51 -39    
avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/src/java/org/apache/avalon/ide/repository/testrepo/TestrepoPlugin.java
  
  Index: TestrepoPlugin.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/ide/org.apache.avalon.ide.repository.testrepo/src/java/org/apache/avalon/ide/repository/testrepo/TestrepoPlugin.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestrepoPlugin.java       1 Dec 2003 14:16:21 -0000       1.1
  +++ TestrepoPlugin.java       2 Dec 2003 10:19:05 -0000       1.2
  @@ -8,56 +8,68 @@
   /**
    * The main plugin class to be used in the desktop.
    */
  -public class TestrepoPlugin extends AbstractUIPlugin {
  -     //The shared instance.
  -     private static TestrepoPlugin plugin;
  -     //Resource bundle.
  -     private ResourceBundle resourceBundle;
  -     
  -     /**
  +public class TestrepoPlugin extends AbstractUIPlugin
  +{
  +    //The shared instance.
  +    private static TestrepoPlugin plugin;
  +    //Resource bundle.
  +    private ResourceBundle resourceBundle;
  +
  +    /**
         * The constructor.
         */
  -     public TestrepoPlugin(IPluginDescriptor descriptor) {
  -             super(descriptor);
  -             plugin = this;
  -             try {
  -                     resourceBundle= 
ResourceBundle.getBundle("org.apache.avalon.ide.repository.testrepo.TestrepoPluginResources");
  -             } catch (MissingResourceException x) {
  -                     resourceBundle = null;
  -             }
  -     }
  +    public TestrepoPlugin(IPluginDescriptor descriptor)
  +    {
  +        super(descriptor);
  +        plugin = this;
  +        try
  +        {
  +            resourceBundle =
  +                ResourceBundle.getBundle(
  +                    
"org.apache.avalon.ide.repository.testrepo.TestrepoPluginResources");
  +        } catch (MissingResourceException x)
  +        {
  +            resourceBundle = null;
  +        }
  +    }
   
  -     /**
  +    /**
         * Returns the shared instance.
         */
  -     public static TestrepoPlugin getDefault() {
  -             return plugin;
  -     }
  +    public static TestrepoPlugin getDefault()
  +    {
  +        return plugin;
  +    }
   
  -     /**
  +    /**
         * Returns the workspace instance.
         */
  -     public static IWorkspace getWorkspace() {
  -             return ResourcesPlugin.getWorkspace();
  -     }
  +    public static IWorkspace getWorkspace()
  +    {
  +        return ResourcesPlugin.getWorkspace();
  +    }
   
  -     /**
  -      * Returns the string from the plugin's resource bundle,
  -      * or 'key' if not found.
  +    /**
  +      * Returns the string from the plugin's resource bundle, or 'key' if not
  +      * found.
         */
  -     public static String getResourceString(String key) {
  -             ResourceBundle bundle= TestrepoPlugin.getDefault().getResourceBundle();
  -             try {
  -                     return (bundle!=null ? bundle.getString(key) : key);
  -             } catch (MissingResourceException e) {
  -                     return key;
  -             }
  -     }
  +    public static String getResourceString(String key)
  +    {
  +        ResourceBundle bundle = TestrepoPlugin.getDefault().getResourceBundle();
  +        try
  +        {
  +            return (bundle != null ? bundle.getString(key) : key);
  +        } catch (MissingResourceException e)
  +        {
  +            return key;
  +        }
  +    }
   
  -     /**
  +    /**
         * Returns the plugin's resource bundle,
         */
  -     public ResourceBundle getResourceBundle() {
  -             return resourceBundle;
  -     }
  +    public ResourceBundle getResourceBundle()
  +    {
  +        return resourceBundle;
  +    }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to