From: incastrix Date: Tue, 6 Oct 2009 19:47:49 +0000 (+0000) Subject: Refactory X-Git-Url: http://secure.phpeclipse.com Refactory --- diff --git a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF index 24058d5..4586d82 100644 --- a/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF +++ b/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF @@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.core.runtime, org.eclipse.debug.ui, - org.eclipse.ui.externaltools + org.eclipse.ui.externaltools, + net.sourceforge.phpeclipse.ui Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-ActivationPolicy: lazy diff --git a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java index e28f9f2..742ac88 100644 --- a/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java +++ b/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java @@ -11,6 +11,7 @@ import java.text.MessageFormat; import net.sourceforge.phpdt.externaltools.launchConfigurations.ExternalToolsUtil; import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin; +import net.sourceforge.phpeclipse.ui.WebUI; //import net.sourceforge.phpeclipse.ui.WebUI; import org.eclipse.jface.action.IAction; diff --git a/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF index 25a9cdf..fc55542 100644 --- a/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF +++ b/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime, net.sourceforge.phpeclipse.ui Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.4 +Import-Package: org.eclipse.ui.texteditor diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java index ca8bb68..21e80e7 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java @@ -34,7 +34,8 @@ public class RenameIdentifierWizard extends RefactoringWizard { // /////////////////////////////////////// protected void addUserInputPages() { - setDefaultPageTitle(getRefactoring().getName()); + //incastrix + //setDefaultPageTitle(getRefactoring().getName()); addPage(new RenameLocalVariablePage(info)); } } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java index a4f8941..c2a2910 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java @@ -31,7 +31,8 @@ public class RenameLocalVariableWizard extends RefactoringWizard { } protected void addUserInputPages() { - setDefaultPageTitle(getRefactoring().getName()); + //incastrix + //setDefaultPageTitle(getRefactoring().getName()); addPage(new RenameLocalVariablePage(info)); } } diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java index f21bfb6..b2a5da6 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java @@ -15,7 +15,9 @@ import net.sourceforge.phpdt.core.IJavaProject; import net.sourceforge.phpdt.core.IPackageFragmentRoot; import net.sourceforge.phpdt.core.JavaCore; import net.sourceforge.phpdt.core.JavaModelException; -import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +// incastrix +//import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +import net.sourceforge.phpeclipse.ui.StatusInfo; import net.sourceforge.phpdt.internal.ui.viewsupport.IViewPartInputProvider; import net.sourceforge.phpdt.internal.ui.wizards.NewWizardMessages; import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java index 653d4a0..90cce1e 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java @@ -10,7 +10,9 @@ *******************************************************************************/ package net.sourceforge.phpdt.ui.wizards; -import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +//incastrix +//import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +import net.sourceforge.phpeclipse.ui.StatusInfo; import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil; import org.eclipse.core.runtime.IStatus; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java index a73147a..9819992 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java @@ -24,7 +24,9 @@ import net.sourceforge.phpdt.core.ToolFactory; import net.sourceforge.phpdt.core.compiler.IScanner; import net.sourceforge.phpdt.core.compiler.ITerminalSymbols; import net.sourceforge.phpdt.core.compiler.InvalidInputException; -import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +//incastrix +//import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo; +import net.sourceforge.phpeclipse.ui.StatusInfo; import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility; import net.sourceforge.phpdt.internal.corext.template.php.JavaContext; import net.sourceforge.phpdt.internal.corext.template.php.Templates; diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java index d330b73..93d23ff 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java @@ -37,7 +37,7 @@ import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI.ExitFlags; import net.sourceforge.phpdt.ui.IWorkingCopyManager; import net.sourceforge.phpdt.ui.PreferenceConstants; import net.sourceforge.phpdt.ui.actions.GenerateActionGroup; -import net.sourceforge.phpdt.ui.text.JavaTextTools; +//import net.sourceforge.phpdt.ui.text.JavaTextTools; import net.sourceforge.phpeclipse.PHPeclipsePlugin; import net.sourceforge.phpeclipse.phpeditor.actions.RTrimAction; import net.sourceforge.phpeclipse.ui.WebUI; @@ -87,7 +87,7 @@ import org.eclipse.swt.custom.VerifyKeyListener; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.RGB; +//import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; @@ -1889,11 +1889,11 @@ public class PHPUnitEditor extends PHPEditor { // implements // return getColor(rgb); // } - private Color getColor(RGB rgb) { - JavaTextTools textTools = WebUI.getDefault() - .getJavaTextTools(); - return textTools.getColorManager().getColor(rgb); - } +// private Color getColor(RGB rgb) { +// JavaTextTools textTools = WebUI.getDefault() +// .getJavaTextTools(); +// return textTools.getColorManager().getColor(rgb); +// } // private Color getColor(AnnotationType annotationType) { // AnnotationInfo info = (AnnotationInfo) diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/StatusInfo.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/StatusInfo.java new file mode 100644 index 0000000..713a7fb --- /dev/null +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/StatusInfo.java @@ -0,0 +1,185 @@ +package net.sourceforge.phpeclipse.ui; + +/********************************************************************** + Copyright (c) 2000, 2002 IBM Corp. All rights reserved. + This file is made available under the terms of the Common Public License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/legal/cpl-v10.html + **********************************************************************/ + +//incastrix +//import net.sourceforge.phpdt.externaltools.model.IExternalToolConstants; + +import org.eclipse.core.runtime.IStatus; +//incastrix +//import org.eclipse.jface.text.Assert; +import org.eclipse.core.runtime.Assert; + +/** + * A settable IStatus. Can be an error, warning, info or ok. For error, info and + * warning states, a message describes the problem. + */ +public class StatusInfo implements IStatus { + + private String fStatusMessage; + + private int fSeverity; + + /** + * Creates a status set to OK (no message) + */ + public StatusInfo() { + this(OK, null); + } + + /** + * Creates a status . + * + * @param severity + * The status severity: ERROR, WARNING, INFO and OK. + * @param message + * The message of the status. Applies only for ERROR, WARNING and + * INFO. + */ + public StatusInfo(int severity, String message) { + fStatusMessage = message; + fSeverity = severity; + } + + /** + * Returns if the status' severity is OK. + */ + public boolean isOK() { + return fSeverity == IStatus.OK; + } + + /** + * Returns if the status' severity is WARNING. + */ + public boolean isWarning() { + return fSeverity == IStatus.WARNING; + } + + /** + * Returns if the status' severity is INFO. + */ + public boolean isInfo() { + return fSeverity == IStatus.INFO; + } + + /** + * Returns if the status' severity is ERROR. + */ + public boolean isError() { + return fSeverity == IStatus.ERROR; + } + + /** + * @see IStatus#getMessage + */ + public String getMessage() { + return fStatusMessage; + } + + /** + * Sets the status to ERROR. + * + * @param The + * error message (can be empty, but not null) + */ + public void setError(String errorMessage) { + Assert.isNotNull(errorMessage); + fStatusMessage = errorMessage; + fSeverity = IStatus.ERROR; + } + + /** + * Sets the status to WARNING. + * + * @param The + * warning message (can be empty, but not null) + */ + public void setWarning(String warningMessage) { + Assert.isNotNull(warningMessage); + fStatusMessage = warningMessage; + fSeverity = IStatus.WARNING; + } + + /** + * Sets the status to INFO. + * + * @param The + * info message (can be empty, but not null) + */ + public void setInfo(String infoMessage) { + Assert.isNotNull(infoMessage); + fStatusMessage = infoMessage; + fSeverity = IStatus.INFO; + } + + /** + * Sets the status to OK. + */ + public void setOK() { + fStatusMessage = null; + fSeverity = IStatus.OK; + } + + /* + * @see IStatus#matches(int) + */ + public boolean matches(int severityMask) { + return (fSeverity & severityMask) != 0; + } + + /** + * Returns always false. + * + * @see IStatus#isMultiStatus() + */ + public boolean isMultiStatus() { + return false; + } + + /* + * @see IStatus#getSeverity() + */ + public int getSeverity() { + return fSeverity; + } + + /* + * @see IStatus#getPlugin() + */ + public String getPlugin() { + return WebUI.PLUGIN_ID/* IExternalToolConstants.PLUGIN_ID*/; + } + + /** + * Returns always null. + * + * @see IStatus#getException() + */ + public Throwable getException() { + return null; + } + + /** + * Returns always the error severity. + * + * @see IStatus#getCode() + */ + public int getCode() { + return fSeverity; + } + + /** + * Returns always null. + * + * @see IStatus#getChildren() + */ + public IStatus[] getChildren() { + return new IStatus[0]; + } + +} \ No newline at end of file diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java index 7c3cddc..ca6517c 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java +++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java @@ -52,7 +52,7 @@ import net.sourceforge.phpeclipse.builder.ExternalEditorInput; import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider; import net.sourceforge.phpeclipse.builder.FileStorage; import net.sourceforge.phpeclipse.builder.IdentifierIndexManager; -import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter; +import net.sourceforge.phpeclipse.DocumentAdapter; import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider; import net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider; //import net.sourceforge.phpeclipse.phpeditor.PHPSyntaxRdr; diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java index d8ced2c..660a92e 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java @@ -26,26 +26,26 @@ import org.eclipse.jdt.core.dom.AnnotationTypeMemberDeclaration; import org.eclipse.jdt.core.dom.AnonymousClassDeclaration; import org.eclipse.jdt.core.dom.ArrayAccess; import org.eclipse.jdt.core.dom.ArrayCreation;*/ -import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer; +//import net.sourceforge.phpdt.internal.compiler.ast.ArrayInitializer; /*import org.eclipse.jdt.core.dom.ArrayType;*/ -import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement; -import net.sourceforge.phpdt.internal.compiler.ast.Assignment; -import net.sourceforge.phpdt.internal.compiler.ast.Block; -import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.AssertStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.Assignment; +//import net.sourceforge.phpdt.internal.compiler.ast.Block; +//import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement; /*import org.eclipse.jdt.core.dom.BlockComment; import org.eclipse.jdt.core.dom.BodyDeclaration; import org.eclipse.jdt.core.dom.BooleanLiteral;*/ -import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement; -import net.sourceforge.phpdt.internal.compiler.ast.CastExpression; +//import net.sourceforge.phpdt.internal.compiler.ast.BreakStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.CastExpression; /*import org.eclipse.jdt.core.dom.CatchClause; import org.eclipse.jdt.core.dom.CharacterLiteral; import org.eclipse.jdt.core.dom.ClassInstanceCreation; import org.eclipse.jdt.core.dom.CompilationUnit;*/ -import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression; +//import net.sourceforge.phpdt.internal.compiler.ast.ConditionalExpression; /*import org.eclipse.jdt.core.dom.ConstructorInvocation;*/ -import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement; -import net.sourceforge.phpdt.internal.compiler.ast.DoStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.ContinueStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.DoStatement; import net.sourceforge.phpdt.internal.compiler.ast.EmptyStatement; /*import org.eclipse.jdt.core.dom.EnhancedForStatement; import org.eclipse.jdt.core.dom.EnumConstantDeclaration; @@ -53,17 +53,17 @@ import org.eclipse.jdt.core.dom.EnumDeclaration; import org.eclipse.jdt.core.dom.Expression; import org.eclipse.jdt.core.dom.ExpressionStatement; import org.eclipse.jdt.core.dom.FieldAccess;*/ -import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration; -import net.sourceforge.phpdt.internal.compiler.ast.ForStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.FieldDeclaration; +//import net.sourceforge.phpdt.internal.compiler.ast.ForStatement; /*import org.eclipse.jdt.core.dom.IBinding; import org.eclipse.jdt.core.dom.IVariableBinding;*/ -import net.sourceforge.phpdt.internal.compiler.ast.IfStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.IfStatement; /*import org.eclipse.jdt.core.dom.ImportDeclaration; import org.eclipse.jdt.core.dom.InfixExpression;*/ -import net.sourceforge.phpdt.internal.compiler.ast.Initializer; -import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression; +//import net.sourceforge.phpdt.internal.compiler.ast.Initializer; +//import net.sourceforge.phpdt.internal.compiler.ast.InstanceOfExpression; /*import org.eclipse.jdt.core.dom.Javadoc;*/ -import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.LabeledStatement; /*import org.eclipse.jdt.core.dom.LineComment; import org.eclipse.jdt.core.dom.MarkerAnnotation; import org.eclipse.jdt.core.dom.MemberRef; @@ -75,41 +75,41 @@ import org.eclipse.jdt.core.dom.MethodRefParameter; import org.eclipse.jdt.core.dom.Modifier; import org.eclipse.jdt.core.dom.Name; import org.eclipse.jdt.core.dom.NormalAnnotation;*/ -import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral; -import net.sourceforge.phpdt.internal.compiler.ast.NumberLiteral; +//import net.sourceforge.phpdt.internal.compiler.ast.NullLiteral; +//import net.sourceforge.phpdt.internal.compiler.ast.NumberLiteral; /*import org.eclipse.jdt.core.dom.PackageDeclaration; import org.eclipse.jdt.core.dom.ParameterizedType; import org.eclipse.jdt.core.dom.ParenthesizedExpression;*/ -import net.sourceforge.phpdt.internal.compiler.ast.PostfixExpression; -import net.sourceforge.phpdt.internal.compiler.ast.PrefixExpression; +//import net.sourceforge.phpdt.internal.compiler.ast.PostfixExpression; +//import net.sourceforge.phpdt.internal.compiler.ast.PrefixExpression; /*import org.eclipse.jdt.core.dom.PrimitiveType; import org.eclipse.jdt.core.dom.QualifiedName; import org.eclipse.jdt.core.dom.QualifiedType;*/ -import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.ReturnStatement; /*import org.eclipse.jdt.core.dom.SimpleName; import org.eclipse.jdt.core.dom.SimpleType; import org.eclipse.jdt.core.dom.SingleMemberAnnotation; import org.eclipse.jdt.core.dom.SingleVariableDeclaration;*/ -import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral; +//import net.sourceforge.phpdt.internal.compiler.ast.StringLiteral; /*import org.eclipse.jdt.core.dom.SuperConstructorInvocation; import org.eclipse.jdt.core.dom.SuperFieldAccess; import org.eclipse.jdt.core.dom.SuperMethodInvocation; import org.eclipse.jdt.core.dom.SwitchCase;*/ -import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.SwitchStatement; /*import org.eclipse.jdt.core.dom.SynchronizedStatement; import org.eclipse.jdt.core.dom.TagElement; import org.eclipse.jdt.core.dom.TextElement; import org.eclipse.jdt.core.dom.ThisExpression;*/ -import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement; -import net.sourceforge.phpdt.internal.compiler.ast.TryStatement; -import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration; +//import net.sourceforge.phpdt.internal.compiler.ast.ThrowStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.TryStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.TypeDeclaration; /*import org.eclipse.jdt.core.dom.TypeDeclarationStatement; import org.eclipse.jdt.core.dom.TypeLiteral; import org.eclipse.jdt.core.dom.TypeParameter; import org.eclipse.jdt.core.dom.VariableDeclarationExpression; import org.eclipse.jdt.core.dom.VariableDeclarationFragment; import org.eclipse.jdt.core.dom.VariableDeclarationStatement;*/ -import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement; +//import net.sourceforge.phpdt.internal.compiler.ast.WhileStatement; /*import org.eclipse.jdt.core.dom.WildcardType; import org.eclipse.jdt.core.dom.PrefixExpression.Operator;*/ @@ -754,12 +754,12 @@ public class ValidBreakpointLocationLocator extends ASTVisitor { super.endVisit(node); }*/ - private String getLabel() { - if (fLabels == null || fLabels.isEmpty()) { - return null; - } - return (String) fLabels.get(fLabels.size() - 1); - } +// private String getLabel() { +// if (fLabels == null || fLabels.isEmpty()) { +// return null; +// } +// return (String) fLabels.get(fLabels.size() - 1); +// } // private void nestLabel(String label) { // if (fLabels == null) { diff --git a/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF index 9443ab0..f5c610f 100644 --- a/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF +++ b/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF @@ -48,9 +48,11 @@ Export-Package: net.sourceforge.phpdt.core, net.sourceforge.phpeclipse.wizards Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, - org.eclipse.ltk.core.refactoring + org.eclipse.ltk.core.refactoring, + org.eclipse.text;bundle-version="3.4.0", + org.eclipse.ui.ide, + org.eclipse.swt Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.4 Import-Package: net.sourceforge.phpdt.internal.core.util, - org.eclipse.core.filebuffers, - org.eclipse.ui + org.eclipse.core.filebuffers diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/DocumentAdapter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/DocumentAdapter.java similarity index 99% rename from net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/DocumentAdapter.java rename to net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/DocumentAdapter.java index 124fd7d..5c81353 100644 --- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/DocumentAdapter.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/DocumentAdapter.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package net.sourceforge.phpeclipse.phpeditor; +package net.sourceforge.phpeclipse; import java.util.ArrayList; import java.util.HashSet;