[jboss-cvs] jboss-seam/src/main/org/jboss/seam/theme ...

[Gavin King]

  User: gavin   
  Date: 06/11/16 12:25:06

  Modified:    src/main/org/jboss/seam/theme   Theme.java
                        ThemeSelector.java
  Log:
  put everything in its proper namespace JBSEAM-259
  
  Revision  Changes    Path
  1.2       +2 -3      jboss-seam/src/main/org/jboss/seam/theme/Theme.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Theme.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme/Theme.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Theme.java	22 Jun 2006 05:24:03 -0000	1.1
  +++ Theme.java	16 Nov 2006 17:25:06 -0000	1.2
  @@ -12,7 +12,6 @@
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  @@ -26,7 +25,7 @@
    */
   @Scope(ScopeType.SESSION)
   @Intercept(NEVER)
  - at Name("theme")
  + at Name("org.jboss.seam.theme.theme")
   public class Theme implements Serializable {
      
      private transient Map messages;
  @@ -105,6 +104,6 @@
      
      public static java.util.Map instance()
      {
  -      return (java.util.Map) Component.getInstance( Seam.getComponentName(Theme.class), true );
  +      return (java.util.Map) Component.getInstance(Theme.class, true );
      }
   }
  
  
  
  1.5       +2 -2      jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ThemeSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ThemeSelector.java	10 Oct 2006 19:37:38 -0000	1.4
  +++ ThemeSelector.java	16 Nov 2006 17:25:06 -0000	1.5
  @@ -33,7 +33,7 @@
    * @author Gavin King
    */
   @Scope(ScopeType.SESSION)
  - at Name("themeSelector")
  + at Name("org.jboss.seam.theme.themeSelector")
   @Intercept(NEVER)
   public class ThemeSelector extends AbstractMutable implements Serializable
   {
  @@ -133,7 +133,7 @@
         {
            throw new IllegalStateException("No active session context");
         }
  -      return (ThemeSelector) Component.getInstance( Seam.getComponentName(ThemeSelector.class), ScopeType.SESSION, true );
  +      return (ThemeSelector) Component.getInstance(ThemeSelector.class, ScopeType.SESSION, true );
      }
   
      public String[] getAvailableThemes()