Author: scabanovich
Date: 2008-02-29 05:30:54 -0500 (Fri, 29 Feb 2008)
New Revision: 6646
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
Log:
JBIDE-1816
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-02-28
17:11:00 UTC (rev 6645)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf.properties 2008-02-29
10:30:54 UTC (rev 6646)
@@ -579,7 +579,7 @@
JSFProcessGroup_Rename_0=/jsf/noHelpYet.html
JSFProcessGroup_Rename_0.WindowTitle=Rename
-JSFProcessGroup_Rename_0.Title=
+JSFProcessGroup_Rename_0.Title=JSF Process View
JSFProcessGroup_Rename_0.Message=
JSFProcessGroup_Properties=/jsf/noHelpYet.html
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-02-28
17:11:00 UTC (rev 6645)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/AddViewSupport.java 2008-02-29
10:30:54 UTC (rev 6646)
@@ -223,12 +223,13 @@
return isCorrectPath(path) && !fileExists(path);
}
- String FORBIDDEN_INDICES = "\"\n\t*\\:<>?|";
+ static String FORBIDDEN_INDICES = "\"\n\t*\\:<>?|";
- private boolean isCorrectPath(String path) {
+ static boolean isCorrectPath(String path) {
if(path == null || path.equals("/") || path.indexOf("//") >= 0)
return false;
if(path.endsWith("/") || path.indexOf("../") >= 0) return
false;
if(path.endsWith("..")) return false;
+ if(path.equals("*")) return true;
for (int i = 0; i < FORBIDDEN_INDICES.length(); i++) {
if(path.indexOf(FORBIDDEN_INDICES.charAt(i)) >= 0) {
return false;
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-02-28
17:11:00 UTC (rev 6645)
+++
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/RenameViewSupport.java 2008-02-29
10:30:54 UTC (rev 6646)
@@ -11,13 +11,16 @@
package org.jboss.tools.jsf.model.handlers;
import java.util.*;
+
import org.eclipse.core.resources.*;
import org.eclipse.core.runtime.*;
import org.jboss.tools.common.meta.action.impl.*;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
+import org.jboss.tools.jsf.messages.JSFUIMessages;
import org.jboss.tools.jsf.model.*;
+import org.jboss.tools.jsf.model.handlers.AddViewSupport.ViewValidator;
import org.jboss.tools.jsf.model.helpers.*;
import org.jboss.tools.jsf.model.impl.NavigationRuleObjectImpl;
@@ -199,4 +202,24 @@
}
}
+ protected DefaultWizardDataValidator viewValidator = new ViewValidator();
+
+ public WizardDataValidator getValidator(int step) {
+ viewValidator.setSupport(this, step);
+ return viewValidator;
+ }
+
+ class ViewValidator extends DefaultWizardDataValidator {
+ public void validate(Properties data) {
+ super.validate(data);
+ if(message != null) return;
+ String path = data.getProperty("from-view-id");
+ if(!AddViewSupport.isCorrectPath(path)) {
+ message = JSFUIMessages.ATTRIBUTE_FROM_VIEW_ID_IS_NOT_CORRECT;
+ }
+ if(message != null) return;
+
+ }
+ }
+
}
Show replies by date