From 32e3b70935ef4e61e28adc13c7520cfbb515af38 Mon Sep 17 00:00:00 2001 From: khartlage Date: Wed, 28 Apr 2004 20:32:15 +0000 Subject: [PATCH] misc changes --- net.sourceforge.phpeclipse/.project | 1 - net.sourceforge.phpeclipse/plugin.xml | 6 +- .../phpdt/internal/compiler/Compiler.java | 10 +- .../phpdt/internal/compiler/parser/Parser.java | 41 +++-- .../core/builder/AdditionalTypeCollection.java | 22 -- .../core/builder/IncrementalImageBuilder.java | 14 +- .../internal/core/builder/ReferenceCollection.java | 226 -------------------- .../internal/ui/text/template/SQLProposal.java | 1 - .../sourceforge/phpdt/ui/PreferenceConstants.java | 2 +- 9 files changed, 41 insertions(+), 282 deletions(-) delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AdditionalTypeCollection.java delete mode 100644 net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ReferenceCollection.java diff --git a/net.sourceforge.phpeclipse/.project b/net.sourceforge.phpeclipse/.project index 6487cef..6aa6c77 100644 --- a/net.sourceforge.phpeclipse/.project +++ b/net.sourceforge.phpeclipse/.project @@ -4,7 +4,6 @@ net.sourceforge.phpeclipse - net.sourceforge.phpeclipse.quantum net.sourceforge.phpeclipse.quantum.sql diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml index 67dadcc..4342e98 100644 --- a/net.sourceforge.phpeclipse/plugin.xml +++ b/net.sourceforge.phpeclipse/plugin.xml @@ -3,7 +3,7 @@ @@ -17,7 +17,7 @@ - + @@ -33,7 +33,7 @@ - + wellKnownName.length) - break; // all remaining well known names are shorter - if (CharOperation.equals(qualifiedName, wellKnownName)) - continue next; - } - - // InternedQualifiedNames[0] is for the rest (> 7 & 1) - // InternedQualifiedNames[1] is for size 2... - // InternedQualifiedNames[6] is for size 7 - ArrayList internedNames = InternedQualifiedNames[qLength <= MaxQualifiedNames ? qLength - 1 : 0]; - for (int j = 0, m = internedNames.size(); j < m; j++) { - char[][] internedName = (char[][]) internedNames.get(j); - if (CharOperation.equals(qualifiedName, internedName)) { - keepers[index++] = internedName; - continue next; - } - } - qualifiedName = internSimpleNames(qualifiedName, false); - internedNames.add(qualifiedName); - keepers[index++] = qualifiedName; - } - if (length > index) { - if (length == 0) return EmptyQualifiedNames; - System.arraycopy(keepers, 0, keepers = new char[index][][], 0, index); - } - return keepers; -} - -static char[][] internSimpleNames(ArrayList simpleStrings) { - if (simpleStrings == null) return EmptySimpleNames; - int length = simpleStrings.size(); - if (length == 0) return EmptySimpleNames; - - char[][] result = new char[length][]; - for (int i = 0; i < length; i++) - result[i] = ((String) simpleStrings.get(i)).toCharArray(); - return internSimpleNames(result, true); -} - -static char[][] internSimpleNames(char[][] simpleNames, boolean removeWellKnown) { - if (simpleNames == null) return EmptySimpleNames; - int length = simpleNames.length; - if (length == 0) return EmptySimpleNames; - - char[][] keepers = new char[length][]; - int index = 0; - next : for (int i = 0; i < length; i++) { - char[] name = simpleNames[i]; - int sLength = name.length; - for (int j = 0, m = WellKnownSimpleNames.length; j < m; j++) { - char[] wellKnownName = WellKnownSimpleNames[j]; - if (sLength > wellKnownName.length) - break; // all remaining well known names are shorter - if (CharOperation.equals(name, wellKnownName)) { - if (!removeWellKnown) - keepers[index++] = WellKnownSimpleNames[j]; - continue next; - } - } - - // InternedSimpleNames[0] is for the rest (> 29) - // InternedSimpleNames[1] is for size 1... - // InternedSimpleNames[29] is for size 29 - ArrayList internedNames = InternedSimpleNames[sLength < MaxSimpleNames ? sLength : 0]; - for (int j = 0, m = internedNames.size(); j < m; j++) { - char[] internedName = (char[]) internedNames.get(j); - if (CharOperation.equals(name, internedName)) { - keepers[index++] = internedName; - continue next; - } - } - internedNames.add(name); - keepers[index++] = name; - } - if (length > index) { - if (index == 0) return EmptySimpleNames; - System.arraycopy(keepers, 0, keepers = new char[index][], 0, index); - } - return keepers; -} -} diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/SQLProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/SQLProposal.java index 0ac931d..605de48 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/SQLProposal.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/SQLProposal.java @@ -4,7 +4,6 @@ */ package net.sourceforge.phpdt.internal.ui.text.template; import net.sourceforge.phpdt.internal.corext.template.TemplateContext; -import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext; import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager; import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI; import net.sourceforge.phpeclipse.PHPeclipsePlugin; diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java index 3dd481b..1110caa 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/PreferenceConstants.java @@ -1846,7 +1846,7 @@ public class PreferenceConstants { store.setDefault(PreferenceConstants.EDITOR_LINE_NUMBER_RULER, false); PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINE_NUMBER_RULER_COLOR, new RGB(0, 0, 0)); - WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT); +// WorkbenchChainedTextFontFieldEditor.startPropagate(store, JFaceResources.TEXT_FONT); PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINKED_POSITION_COLOR, new RGB(0, 200, 100)); PreferenceConverter.setDefault(store, PreferenceConstants.EDITOR_LINK_COLOR, new RGB(0, 0, 255)); -- 1.7.1