Menu
▾
▴
[Phpeclipse-commits] r1699 - in trunk: net.sourceforge.phpeclipse/META-INF net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse net.sourceforge.phpeclipse.externaltools/META-INF net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions net.sourceforge.phpeclipse.phpmanual/META-INF net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model
Author: incastrix
Date: 2009-10-06 14:47:49 -0500 (Tue, 06 Oct 2009)
New Revision: 1699
Added:
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/StatusInfo.java
trunk/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/DocumentAdapter.java
Removed:
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/DocumentAdapter.java
Modified:
trunk/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
trunk/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
trunk/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java
trunk/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
Log:
Refactory
Modified: trunk/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF
===================================================================
--- trunk/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse/META-INF/MANIFEST.MF 2009-10-06 19:47:49 UTC (rev 1699)
@@ -48,9 +48,11 @@
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
Added: trunk/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/DocumentAdapter.java
Modified: trunk/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF
===================================================================
--- trunk/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.externaltools/META-INF/MANIFEST.MF 2009-10-06 19:47:49 UTC (rev 1699)
@@ -26,7 +26,8 @@
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
Modified: trunk/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -11,6 +11,7 @@
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;
Modified: trunk/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF
===================================================================
--- trunk/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF 2009-10-06 19:47:49 UTC (rev 1699)
@@ -16,3 +16,4 @@
net.sourceforge.phpeclipse.ui
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Import-Package: org.eclipse.ui.texteditor
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameIdentifierWizard.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -34,7 +34,8 @@
// ///////////////////////////////////////
protected void addUserInputPages() {
- setDefaultPageTitle(getRefactoring().getName());
+ //incastrix
+ //setDefaultPageTitle(getRefactoring().getName());
addPage(new RenameLocalVariablePage(info));
}
}
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ltk/ui/wizards/RenameLocalVariableWizard.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -31,7 +31,8 @@
}
protected void addUserInputPages() {
- setDefaultPageTitle(getRefactoring().getName());
+ //incastrix
+ //setDefaultPageTitle(getRefactoring().getName());
addPage(new RenameLocalVariablePage(info));
}
}
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -15,7 +15,9 @@
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;
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewElementWizardPage.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -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;
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -24,7 +24,9 @@
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;
Deleted: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/DocumentAdapter.java
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -37,7 +37,7 @@
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.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 @@
// 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)
Added: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/StatusInfo.java
Modified: trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -52,7 +52,7 @@
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;
Modified: trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java
===================================================================
--- trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java 2009-10-06 14:10:05 UTC (rev 1698)
+++ trunk/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/ValidBreakpointLocationLocator.java 2009-10-06 19:47:49 UTC (rev 1699)
@@ -26,26 +26,26 @@
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.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.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 @@
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) {
|