1.1 --- a/gsf.tools/nbproject/project.properties Sun Jan 23 09:44:15 2011 +0100
1.2 +++ b/gsf.tools/nbproject/project.properties Tue Jan 25 09:50:02 2011 +0100
1.3 @@ -1,4 +1,4 @@
1.4 build.compiler.deprecation=false
1.5 javac.compilerargs=-Xlint:unchecked
1.6 javac.source=1.5
1.7 -spec.version.base=0.18.0
1.8 +spec.version.base=0.19.0
2.1 --- a/gsf.tools/nbproject/project.xml Sun Jan 23 09:44:15 2011 +0100
2.2 +++ b/gsf.tools/nbproject/project.xml Tue Jan 25 09:50:02 2011 +0100
2.3 @@ -15,21 +15,48 @@
2.4 </run-dependency>
2.5 </dependency>
2.6 <dependency>
2.7 - <code-name-base>org.netbeans.modules.projectapi</code-name-base>
2.8 + <code-name-base>org.netbeans.libs.lucene</code-name-base>
2.9 <build-prerequisite/>
2.10 <compile-dependency/>
2.11 <run-dependency>
2.12 - <release-version>1</release-version>
2.13 - <specification-version>1.3</specification-version>
2.14 + <release-version>3</release-version>
2.15 + <specification-version>3.0</specification-version>
2.16 </run-dependency>
2.17 </dependency>
2.18 <dependency>
2.19 - <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
2.20 + <code-name-base>org.netbeans.modules.editor</code-name-base>
2.21 <build-prerequisite/>
2.22 <compile-dependency/>
2.23 <run-dependency>
2.24 - <release-version>1</release-version>
2.25 - <specification-version>1.13.1.5</specification-version>
2.26 + <release-version>3</release-version>
2.27 + <specification-version>1.53</specification-version>
2.28 + </run-dependency>
2.29 + </dependency>
2.30 + <dependency>
2.31 + <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
2.32 + <build-prerequisite/>
2.33 + <compile-dependency/>
2.34 + <run-dependency>
2.35 + <release-version>0-1</release-version>
2.36 + <specification-version>1.0</specification-version>
2.37 + </run-dependency>
2.38 + </dependency>
2.39 + <dependency>
2.40 + <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
2.41 + <build-prerequisite/>
2.42 + <compile-dependency/>
2.43 + <run-dependency>
2.44 + <release-version>3</release-version>
2.45 + <specification-version>3.1</specification-version>
2.46 + </run-dependency>
2.47 + </dependency>
2.48 + <dependency>
2.49 + <code-name-base>org.netbeans.modules.gsf</code-name-base>
2.50 + <build-prerequisite/>
2.51 + <compile-dependency/>
2.52 + <run-dependency>
2.53 + <release-version>2</release-version>
2.54 + <implementation-version/>
2.55 </run-dependency>
2.56 </dependency>
2.57 <dependency>
2.58 @@ -51,33 +78,6 @@
2.59 </run-dependency>
2.60 </dependency>
2.61 <dependency>
2.62 - <code-name-base>org.netbeans.modules.editor</code-name-base>
2.63 - <build-prerequisite/>
2.64 - <compile-dependency/>
2.65 - <run-dependency>
2.66 - <release-version>3</release-version>
2.67 - <specification-version>1.53</specification-version>
2.68 - </run-dependency>
2.69 - </dependency>
2.70 - <dependency>
2.71 - <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
2.72 - <build-prerequisite/>
2.73 - <compile-dependency/>
2.74 - <run-dependency>
2.75 - <release-version>3</release-version>
2.76 - <specification-version>3.1</specification-version>
2.77 - </run-dependency>
2.78 - </dependency>
2.79 - <dependency>
2.80 - <code-name-base>org.netbeans.modules.gsf</code-name-base>
2.81 - <build-prerequisite/>
2.82 - <compile-dependency/>
2.83 - <run-dependency>
2.84 - <release-version>2</release-version>
2.85 - <implementation-version/>
2.86 - </run-dependency>
2.87 - </dependency>
2.88 - <dependency>
2.89 <code-name-base>org.netbeans.modules.lexer</code-name-base>
2.90 <build-prerequisite/>
2.91 <compile-dependency/>
2.92 @@ -87,6 +87,24 @@
2.93 </run-dependency>
2.94 </dependency>
2.95 <dependency>
2.96 + <code-name-base>org.netbeans.modules.projectapi</code-name-base>
2.97 + <build-prerequisite/>
2.98 + <compile-dependency/>
2.99 + <run-dependency>
2.100 + <release-version>1</release-version>
2.101 + <specification-version>1.3</specification-version>
2.102 + </run-dependency>
2.103 + </dependency>
2.104 + <dependency>
2.105 + <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
2.106 + <build-prerequisite/>
2.107 + <compile-dependency/>
2.108 + <run-dependency>
2.109 + <release-version>1</release-version>
2.110 + <specification-version>1.13.1.5</specification-version>
2.111 + </run-dependency>
2.112 + </dependency>
2.113 + <dependency>
2.114 <code-name-base>org.openide.awt</code-name-base>
2.115 <build-prerequisite/>
2.116 <compile-dependency/>
2.117 @@ -111,15 +129,6 @@
2.118 </run-dependency>
2.119 </dependency>
2.120 <dependency>
2.121 - <code-name-base>org.netbeans.libs.lucene</code-name-base>
2.122 - <build-prerequisite/>
2.123 - <compile-dependency/>
2.124 - <run-dependency>
2.125 - <release-version>1</release-version>
2.126 - <specification-version>2.1</specification-version>
2.127 - </run-dependency>
2.128 - </dependency>
2.129 - <dependency>
2.130 <code-name-base>org.openide.modules</code-name-base>
2.131 <build-prerequisite/>
2.132 <compile-dependency/>
2.133 @@ -159,15 +168,6 @@
2.134 <specification-version>6.8</specification-version>
2.135 </run-dependency>
2.136 </dependency>
2.137 - <dependency>
2.138 - <code-name-base>org.netbeans.modules.editor.deprecated.pre61settings</code-name-base>
2.139 - <build-prerequisite/>
2.140 - <compile-dependency/>
2.141 - <run-dependency>
2.142 - <release-version>0-1</release-version>
2.143 - <specification-version>1.0</specification-version>
2.144 - </run-dependency>
2.145 - </dependency>
2.146 </module-dependencies>
2.147 <public-packages/>
2.148 </data>
3.1 --- a/gsf.tools/src/org/netbeans/modules/gsf/browser/DumpIndex.java Sun Jan 23 09:44:15 2011 +0100
3.2 +++ b/gsf.tools/src/org/netbeans/modules/gsf/browser/DumpIndex.java Tue Jan 25 09:50:02 2011 +0100
3.3 @@ -175,7 +175,7 @@
3.4 List<Match> data;
3.5 data = new ArrayList<Match>();
3.6
3.7 - for (Fieldable f : (List<Fieldable>)luceneDoc.getFields()) { //Remove cast in Lucene 3.0
3.8 + for (Fieldable f : luceneDoc.getFields()) {
3.9 String key = f.name();
3.10 // Skip timestamps?
3.11 //if (key.equals("timestamp")) {
4.1 --- a/gsf.tools/src/org/netbeans/modules/gsf/tools/lucene/IndexBrowserTopComponent.java Sun Jan 23 09:44:15 2011 +0100
4.2 +++ b/gsf.tools/src/org/netbeans/modules/gsf/tools/lucene/IndexBrowserTopComponent.java Tue Jan 25 09:50:02 2011 +0100
4.3 @@ -957,7 +957,7 @@
4.4 }
4.5
4.6 private void initFromLuceneDoc(Document luceneDoc) {
4.7 - for (Fieldable f : (List<Fieldable>)luceneDoc.getFields()) { //Remove cast in Lucene 3.x
4.8 + for (Fieldable f : luceneDoc.getFields()) {
4.9 String key = f.name();
4.10 String value = f.stringValue();
4.11 data.add(new Match(key, value));
5.1 --- a/gsf/nbproject/project.properties Sun Jan 23 09:44:15 2011 +0100
5.2 +++ b/gsf/nbproject/project.properties Tue Jan 25 09:50:02 2011 +0100
5.3 @@ -3,4 +3,4 @@
5.4 javac.source=1.6
5.5 nbm.needs.restart=true
5.6
5.7 -spec.version.base=0.86.0
5.8 +spec.version.base=0.87.0
6.1 --- a/gsf/nbproject/project.xml Sun Jan 23 09:44:15 2011 +0100
6.2 +++ b/gsf/nbproject/project.xml Tue Jan 25 09:50:02 2011 +0100
6.3 @@ -19,8 +19,8 @@
6.4 <build-prerequisite/>
6.5 <compile-dependency/>
6.6 <run-dependency>
6.7 - <release-version>1</release-version>
6.8 - <specification-version>2.1</specification-version>
6.9 + <release-version>3</release-version>
6.10 + <specification-version>3.0</specification-version>
6.11 </run-dependency>
6.12 </dependency>
6.13 <dependency>
7.1 --- a/gsf/src/org/netbeans/modules/gsfret/source/usages/LuceneIndex.java Sun Jan 23 09:44:15 2011 +0100
7.2 +++ b/gsf/src/org/netbeans/modules/gsfret/source/usages/LuceneIndex.java Tue Jan 25 09:50:02 2011 +0100
7.3 @@ -900,7 +900,7 @@
7.4 @Override
7.5 public String toString() {
7.6 StringBuilder sb = new StringBuilder();
7.7 - for (Fieldable f : (List<Fieldable>)doc.getFields()) { //Remove cast in Lucene 3.x
7.8 + for (Fieldable f : doc.getFields()) {
7.9 sb.append(f.name());
7.10 sb.append(":");
7.11 sb.append(f.stringValue());
7.12 @@ -978,7 +978,7 @@
7.13 @Override
7.14 public String toString() {
7.15 StringBuilder sb = new StringBuilder();
7.16 - for (Fieldable f : (List<Fieldable>)doc.getFields()) { //Remove cast in Lucene 3.x
7.17 + for (Fieldable f : doc.getFields()) {
7.18 if (f.name().equals(primaryKey)) {
7.19 sb.append(primaryKey);
7.20 sb.append(":");
8.1 --- a/java.additional.refactorings/manifest.mf Sun Jan 23 09:44:15 2011 +0100
8.2 +++ b/java.additional.refactorings/manifest.mf Tue Jan 25 09:50:02 2011 +0100
8.3 @@ -2,5 +2,5 @@
8.4 OpenIDE-Module: org.netbeans.modules.java.additional.refactorings
8.5 OpenIDE-Module-Layer: org/netbeans/modules/java/additional/refactorings/layer.xml
8.6 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/additional/refactorings/Bundle.properties
8.7 -OpenIDE-Module-Specification-Version: 1.1
8.8 +OpenIDE-Module-Specification-Version: 1.2
8.9
9.1 --- a/java.additional.refactorings/nbproject/project.xml Sun Jan 23 09:44:15 2011 +0100
9.2 +++ b/java.additional.refactorings/nbproject/project.xml Tue Jan 25 09:50:02 2011 +0100
9.3 @@ -6,15 +6,6 @@
9.4 <code-name-base>org.netbeans.modules.java.additional.refactorings</code-name-base>
9.5 <module-dependencies>
9.6 <dependency>
9.7 - <code-name-base>org.netbeans.libs.lucene</code-name-base>
9.8 - <build-prerequisite/>
9.9 - <compile-dependency/>
9.10 - <run-dependency>
9.11 - <release-version>1</release-version>
9.12 - <specification-version>2.1</specification-version>
9.13 - </run-dependency>
9.14 - </dependency>
9.15 - <dependency>
9.16 <code-name-base>org.jdesktop.layout</code-name-base>
9.17 <build-prerequisite/>
9.18 <compile-dependency/>
9.19 @@ -50,6 +41,15 @@
9.20 </run-dependency>
9.21 </dependency>
9.22 <dependency>
9.23 + <code-name-base>org.netbeans.libs.lucene</code-name-base>
9.24 + <build-prerequisite/>
9.25 + <compile-dependency/>
9.26 + <run-dependency>
9.27 + <release-version>3</release-version>
9.28 + <specification-version>3.0</specification-version>
9.29 + </run-dependency>
9.30 + </dependency>
9.31 + <dependency>
9.32 <code-name-base>org.netbeans.modules.java.project</code-name-base>
9.33 <build-prerequisite/>
9.34 <compile-dependency/>