Author: rob.stryker(a)jboss.com Date: 2012-04-26 03:34:22 -0400 (Thu, 26 Apr 2012) New Revision: 40509 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleRestartSection.java Log: JBIDE-11660 remove cache, compile every time, add error checking to editor Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-04-26 06:05:57 UTC (rev 40508) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-04-26 07:34:22 UTC (rev 40509) @@ -122,8 +122,6 @@ return getAttribute(ZIP_DEPLOYMENTS_PREF, false); } - // cannot be static, as different servers may have different defaults - private Pattern restartFilePattern = null; protected Pattern defaultFilePattern = Pattern.compile( getDefaultModuleRestartPattern(), Pattern.CASE_INSENSITIVE); @@ -135,30 +133,25 @@ public void setRestartFilePattern(String filepattern) { setAttribute(ORG_JBOSS_TOOLS_AS_RESTART_FILE_PATTERN, filepattern); - this.restartFilePattern = null; } public Pattern getRestartFilePattern() { - if( this.restartFilePattern == null ) { - compileRestartPattern(); - } - return this.restartFilePattern; + return getCompiledRestartPattern(); } - private void compileRestartPattern() { + private Pattern getCompiledRestartPattern() { // ensure it's set properly from the saved attribute String currentPattern = getAttribute(ORG_JBOSS_TOOLS_AS_RESTART_FILE_PATTERN, (String)null); try { - this.restartFilePattern = currentPattern == null ? defaultFilePattern : + return currentPattern == null ? defaultFilePattern : Pattern.compile(currentPattern, Pattern.CASE_INSENSITIVE); } catch(PatternSyntaxException pse) { JBossServerCorePlugin.log("Could not set restart file pattern to: " + currentPattern, pse); //$NON-NLS-1$ // avoid errors over and over - this.restartFilePattern = defaultFilePattern; + return defaultFilePattern; } } - /* * (non-Javadoc) * @see org.jboss.ide.eclipse.as.core.server.attributes.IDeployableServer#getAttributeHelper() Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-04-26 06:05:57 UTC (rev 40508) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-04-26 07:34:22 UTC (rev 40509) @@ -236,11 +236,12 @@ public boolean changedFileRequiresModuleRestart(IModuleFile file) { IDeployableServer ds = ServerConverter.getDeployableServer(getServer()); Pattern restartFilePattern = ds.getRestartFilePattern(); - if (restartFilePattern != null) { + boolean result = false; + if (restartFilePattern != null) { // using find over matches to make it a substring search by default and avoid having to specify .*.class$ instead of just .class$ - return restartFilePattern.matcher(file.getName()).find(); + result = restartFilePattern.matcher(file.getName()).find(); } - return false; + return result; } /** Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleRestartSection.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleRestartSection.java 2012-04-26 06:05:57 UTC (rev 40508) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ModuleRestartSection.java 2012-04-26 07:34:22 UTC (rev 40509) @@ -10,6 +10,9 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.ui.editor; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; + import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -118,10 +121,26 @@ public class SetCustomPatternCommand extends ServerWorkingCopyPropertyCommand { public SetCustomPatternCommand(IServerWorkingCopy server) { - super(server, Messages.EditorChangeStopPollerCommandName, + super(server, "Modify Module Restart Pattern", restartPatternText, restartPatternText.getText(), IDeployableServer.ORG_JBOSS_TOOLS_AS_RESTART_FILE_PATTERN, textListener); } + public void undo() { + super.undo(); + validate(); + } + public void execute() { + super.execute(); + validate(); + } + protected void validate() { + try { + Pattern.compile(restartPatternText.getText(), Pattern.CASE_INSENSITIVE); + setErrorMessage(null); + } catch(PatternSyntaxException pse) { + setErrorMessage("Invalid Restart Pattern: " + restartPatternText.getText()); + } + } } }