You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2008/07/06 08:48:13 UTC

svn commit: r674263 - in /myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl: jsf/JsfGuiBuilderFactory.java myfaces/MyFacesCheck.java

Author: imario
Date: Sat Jul  5 23:48:13 2008
New Revision: 674263

URL: http://svn.apache.org/viewvc?rev=674263&view=rev
Log:
changed how to check for MyFaces. In fact at this point we are
interested more in if the Tomahawk components are available.

Modified:
    myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java
    myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java?rev=674263&r1=674262&r2=674263&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/jsf/JsfGuiBuilderFactory.java Sat Jul  5 23:48:13 2008
@@ -49,12 +49,12 @@
             try
             {
                 @SuppressWarnings("unchecked")
-                Class<? extends JsfGuiBuilder> guiBuilderClass = 
+                Class<? extends JsfGuiBuilder> guiBuilderClass =
                     (Class<? extends JsfGuiBuilder>) Class.forName(guiBuilderName);
                 try
                 {
                     // try to find a decorator constructor
-                    Constructor<? extends JsfGuiBuilder> decoratorConst = 
+                    Constructor<? extends JsfGuiBuilder> decoratorConst =
                         guiBuilderClass.getConstructor(new Class[]{JsfGuiBuilder.class});
                     return decoratorConst.newInstance(new Object[]{
                         createGuiBuilderInternal()
@@ -97,7 +97,7 @@
     protected static JsfGuiBuilder createGuiBuilderInternal()
     {
         JsfGuiBuilder guiBuilder = null;
-        if (MyFacesCheck.isMyFacesAvailable())
+        if (MyFacesCheck.isTomahawkAvailable())
         {
             try
             {
@@ -105,7 +105,7 @@
                 // generates nicer output...
                 String myfacesImpl = "org.apache.myfaces.orchestra.dynaForm.jsf.guiBuilder.impl.myfaces.MyFacesGuiBuilder";
                 @SuppressWarnings("unchecked")
-                Class<? extends JsfGuiBuilder> myfacesGuiBuilder = 
+                Class<? extends JsfGuiBuilder> myfacesGuiBuilder =
                     ClassUtils.classForName(myfacesImpl);
                 guiBuilder = (JsfGuiBuilder) myfacesGuiBuilder.newInstance();
             }

Modified: myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java?rev=674263&r1=674262&r2=674263&view=diff
==============================================================================
--- myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java (original)
+++ myfaces/orchestra/trunk/sandbox/src/main/java/org/apache/myfaces/orchestra/dynaForm/jsf/guiBuilder/impl/myfaces/MyFacesCheck.java Sat Jul  5 23:48:13 2008
@@ -20,18 +20,18 @@
 
 public class MyFacesCheck
 {
-    private static boolean myFacesAvailable;
+    private static boolean tomahawkAvailable;
 
     static
     {
         try
         {
-            Class.forName("org.apache.myfaces.webapp.MyFacesServlet");
-            myFacesAvailable = true;
+            Class.forName("org.apache.myfaces.shared_tomahawk.util.ClassUtils");
+            tomahawkAvailable = true;
         }
         catch (ClassNotFoundException e)
         {
-            myFacesAvailable = false;
+            tomahawkAvailable = false;
         }
     }
 
@@ -39,8 +39,8 @@
     {
     }
 
-    public static boolean isMyFacesAvailable()
+    public static boolean isTomahawkAvailable()
     {
-        return myFacesAvailable;
+        return tomahawkAvailable;
     }
 }