IDE-709

Signed-off-by: Gregory Amerson <gregory.amerson@liferay.com>
liferay · Sep 24, 2012 · 7bfb09e · 7bfb09e
1 parent af1bf6b
commit 7bfb09e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 22 deletions.
diff --git a/eclipse/pom.xml b/eclipse/pom.xml
@@ -53,7 +53,7 @@
   <properties>
     <tycho-version>0.15.0</tycho-version>
     <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20120119162704/repository/</orbit-site>
-    <sapphire-site>http://download.eclipse.org/sapphire/0.5.2/repository/</sapphire-site>
+    <sapphire-site>https://hudson.eclipse.org/hudson/job/sapphire-0.5.x/418/artifact/build/repository/</sapphire-site>
   </properties>
 
     <profiles>

diff --git a/.../src/com/liferay/ide/eclipse/portlet/core/operation/NewPortletClassDataModelProvider.java b/.../src/com/liferay/ide/eclipse/portlet/core/operation/NewPortletClassDataModelProvider.java
@@ -19,7 +19,6 @@
 import com.liferay.ide.eclipse.core.util.FileUtil;
 import com.liferay.ide.eclipse.portlet.core.PortletCore;
 import com.liferay.ide.eclipse.project.core.IPluginWizardFragmentProperties;
-import com.liferay.ide.eclipse.sdk.ISDKConstants;
 import com.liferay.ide.eclipse.server.core.ILiferayRuntime;
 import com.liferay.ide.eclipse.server.util.ServerUtil;
 
@@ -60,7 +59,8 @@
 public class NewPortletClassDataModelProvider extends NewWebClassDataModelProvider
 	implements INewPortletClassDataModelProperties, IPluginWizardFragmentProperties {
 
-	protected Properties categories;
+	private static final String PORTLET_SUFFIX_PATTERN = "(?<!^)portlet$";
+    protected Properties categories;
 	protected Properties entryCategories;
 	protected TemplateContextType contextType;
 	protected boolean fragment;
@@ -211,10 +211,10 @@ else if (CLASS_NAME.equals(propertyName)) {
 			return "NewPortlet";
 		}
 		else if (PORTLET_NAME.equals(propertyName) || LIFERAY_PORTLET_NAME.equals(propertyName)) {
-			return getProperty(CLASS_NAME).toString().toLowerCase();
+			return getProperty(CLASS_NAME).toString().toLowerCase().replaceAll( PORTLET_SUFFIX_PATTERN, "" );
 		}
 		else if (DISPLAY_NAME.equals(propertyName) || TITLE.equals(propertyName) || SHORT_TITLE.equals(propertyName)) {
-			return getProperty(CLASS_NAME);
+			return getDisplayNameFromClassName( getProperty(CLASS_NAME).toString() );
 		}
 		else if (KEYWORDS.equals(propertyName)) {
 			return "";
@@ -230,10 +230,10 @@ else if (CREATE_JSPS.equals(propertyName)) {
 		}
 		else if (CREATE_JSPS_FOLDER.equals(propertyName)) {
 			if ( getBooleanProperty( CREATE_NEW_PORTLET_CLASS ) ) {
-				return "/html/" + getProperty( CLASS_NAME ).toString().toLowerCase();
+				return "/html/" + getProperty( CLASS_NAME ).toString().toLowerCase().replaceAll( PORTLET_SUFFIX_PATTERN, "" );
 			}
 			else {
-				return "/html/" + getProperty( PORTLET_NAME ).toString().toLowerCase();
+				return "/html/" + getProperty( PORTLET_NAME ).toString().toLowerCase().replaceAll( PORTLET_SUFFIX_PATTERN, "" );
 			}
 
 		}
@@ -256,7 +256,7 @@ else if (JAVASCRIPT_FILE.equals(propertyName)) {
 			return "/js/main.js";
 		}
 		else if (CSS_CLASS_WRAPPER.equals(propertyName)) {
-			return getProperty(PORTLET_NAME).toString().toLowerCase() + ISDKConstants.PORTLET_PLUGIN_PROJECT_SUFFIX;
+			return getProperty(PORTLET_NAME).toString().toLowerCase();
 		}
 		else if (ID.equals(propertyName)) {
 			return getProperty(PORTLET_NAME);
@@ -349,6 +349,19 @@ protected Object getInitParams() {
 		return initParams;
 	}
 
+    protected String getDisplayNameFromClassName(String oldName) {
+        String[] words = oldName.split("(?<!^)(?=[A-Z])");
+        String newName = new String();
+        for(int i = 0 ; i < words.length ; i++) {
+            if( i > 0 ) {
+                newName = newName.concat(" ");
+            }
+            newName = newName.concat( words[i] );
+        }
+
+        return newName;
+    }
+
 	@Override
 	public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) {
 		if (VIEW_MODE.equals(propertyName)) {

diff --git a/...portlet.ui/src/com/liferay/ide/eclipse/portlet/ui/wizard/NewLiferayPortletWizardPage.java b/...portlet.ui/src/com/liferay/ide/eclipse/portlet/ui/wizard/NewLiferayPortletWizardPage.java
@@ -107,7 +107,7 @@ protected void createLiferayDisplayGroup(Composite composite) {
         this.entryCategory = new Combo(group, SWT.DROP_DOWN);
         this.entryCategory.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         this.synchHelper.synchCombo(entryCategory, ENTRY_CATEGORY, null);
-        
+
         final Label entryWeightLabel = SWTUtil.createLabel(group, "Entry Weight:", 1);
 
         this.entryWeight = SWTUtil.createText(group, 1);
@@ -151,19 +151,6 @@ public void widgetSelected(SelectionEvent e) {
                 entryClassWrapper.setEnabled(createEntryClassButton.getSelection());
             }
         });
-
-        if (entryCategory != null && !entryCategory.isDisposed()) {
-            entryCategory.setEnabled(addToControlPanelButton.getSelection());
-        }
-        if (entryWeight != null && !entryWeight.isDisposed()) {
-            entryWeight.setEnabled(addToControlPanelButton.getSelection());
-        }
-        if (createEntryClassButton != null && !createEntryClassButton.isDisposed()) {
-            createEntryClassButton.setEnabled( addToControlPanelButton.getSelection() );
-        }
-        if (entryClassWrapper != null && !entryClassWrapper.isDisposed()) {
-            entryClassWrapper.setEnabled( createEntryClassButton.getSelection() && createEntryClassButton.getEnabled() );
-        }
 	}
 
 	protected void createLiferayPortletInfoGroup(Composite composite) {
@@ -280,6 +267,24 @@ protected Composite createTopLevelComposite(Composite parent) {
 		return composite;
 	}
 
+    @Override
+    protected void enter() {
+        super.enter();
+
+        if (entryCategory != null && !entryCategory.isDisposed()) {
+            entryCategory.setEnabled(addToControlPanelButton.getSelection());
+        }
+        if (entryWeight != null && !entryWeight.isDisposed()) {
+            entryWeight.setEnabled(addToControlPanelButton.getSelection());
+        }
+        if (createEntryClassButton != null && !createEntryClassButton.isDisposed()) {
+            createEntryClassButton.setEnabled( addToControlPanelButton.getSelection() );
+        }
+        if (entryClassWrapper != null && !entryClassWrapper.isDisposed()) {
+            entryClassWrapper.setEnabled( createEntryClassButton.getSelection() && createEntryClassButton.getEnabled() );
+        }
+    }
+
 	protected ISelectionStatusValidator getContainerDialogSelectionValidator() {
 		return new ISelectionStatusValidator() {