[gatein-commits] gatein SVN: r573 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/webui/application and 1 other directories.

[do-not-reply at jboss.org]

Author: tan_pham_dinh
Date: 2009-11-11 21:01:12 -0500 (Wed, 11 Nov 2009)
New Revision: 573

Modified:
   portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/DataMapper.java
   portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/GadgetRegistryServiceImpl.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
   portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
make gatein can built today, some change to format code

Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/DataMapper.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/DataMapper.java	2009-11-11 20:51:06 UTC (rev 572)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/DataMapper.java	2009-11-12 02:01:12 UTC (rev 573)
@@ -67,7 +67,7 @@
       root.setAttribute(EXO_GADGET_IS_REMOTE, String.valueOf(app.isLocal()));
    }
 
-   public Gadget toApplciation(Document doc) throws Exception
+   public Gadget toApplication(Document doc) throws Exception
    {
       Element root = doc.getDocumentElement();
       Gadget app = new Gadget();

Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/GadgetRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/GadgetRegistryServiceImpl.java	2009-11-11 20:51:06 UTC (rev 572)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/jcr/GadgetRegistryServiceImpl.java	2009-11-12 02:01:12 UTC (rev 573)
@@ -127,7 +127,7 @@
       {
          sessionProvider.close();
       }
-      Gadget gadget = mapper_.toApplciation(entry.getDocument());
+      Gadget gadget = mapper_.toApplication(entry.getDocument());
       return gadget;
    }
 
@@ -152,7 +152,7 @@
          {
             String entryPath = itr.nextNode().getPath().substring(regNode.getPath().length() + 1);
             RegistryEntry entry = regService_.getEntry(sessionProvider, entryPath);
-            Gadget gadget = mapper_.toApplciation(entry.getDocument());
+            Gadget gadget = mapper_.toApplication(entry.getDocument());
             gadgets.add(gadget);
          }
          if (sortComparator != null)

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java	2009-11-11 20:51:06 UTC (rev 572)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletActionListener.java	2009-11-12 02:01:12 UTC (rev 573)
@@ -103,7 +103,7 @@
          }
          else
          {
-            // todo: fix me as this shouldn't probably be done only for the WSRP caseÉ
+            // todo: fix me as this shouldn't probably be done only for the WSRP case
             PortletContext clonedContext = instanceCtx.getClonedContext();
             if (clonedContext != null)
             {

Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2009-11-11 20:51:06 UTC (rev 572)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java	2009-11-12 02:01:12 UTC (rev 573)
@@ -22,7 +22,7 @@
 import org.exoplatform.portal.application.PortalRequestContext;
 import org.exoplatform.portal.config.UserPortalConfig;
 import org.exoplatform.portal.config.UserPortalConfigService;
-import org.exoplatform.portal.config.model.ModelChange;
+import org.exoplatform.portal.pom.data.ModelChange;
 import org.exoplatform.portal.config.model.Page;
 import org.exoplatform.portal.config.model.PortalConfig;
 import org.exoplatform.portal.config.model.PortalProperties;
@@ -537,11 +537,13 @@
          UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
          UIPortalComposer composer = uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
          composer.setEditted(false);
-         if (composer.isUsedInWizard()) {            
+         if (composer.isUsedInWizard())
+         {
             UIWizard wizard = (UIWizard)uiToolPanel.getUIComponent();
             int step = wizard.getCurrentStep();
-            step ++;
-            Event<UIComponent> uiEvent = wizard.createEvent("ViewStep" + step, Phase.PROCESS, event.getRequestContext());
+            step++;
+            Event<UIComponent> uiEvent =
+               wizard.createEvent("ViewStep" + step, Phase.PROCESS, event.getRequestContext());
             uiEvent.broadcast();
             return;
          }
@@ -581,13 +583,15 @@
       public void execute(Event<UIPortalComposer> event) throws Exception
       {
          UIPortalComposer composer = event.getSource();
-         if (composer.isUsedInWizard()) {
+         if (composer.isUsedInWizard())
+         {
             UIWorkingWorkspace uiWorkingWS = composer.getAncestorOfType(UIWorkingWorkspace.class);
             UIPortalToolPanel uiToolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
             UIWizard wizard = (UIWizard)uiToolPanel.getUIComponent();
             int step = wizard.getCurrentStep();
-            step --;
-            Event<UIComponent> uiEvent = wizard.createEvent("ViewStep" + step, Phase.PROCESS, event.getRequestContext());
+            step--;
+            Event<UIComponent> uiEvent =
+               wizard.createEvent("ViewStep" + step, Phase.PROCESS, event.getRequestContext());
             uiEvent.broadcast();
          }
       }