Attachment #93693 for bug #169991

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 169991
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/scala.core/nbproject/project.properties (-1 / +1 lines)
1	spec.version.base=0.2.0	1	spec.version.base=0.3.0
2		2
3	javac.compilerargs=-Xlint:unchecked	3	javac.compilerargs=-Xlint:unchecked
4	javac.source=1.5	4	javac.source=1.5

Lines 48-55 Link Here

(-)a/scala.core/nbproject/project.xml (-2 / +2 lines)
48	<build-prerequisite/>	48	<build-prerequisite/>
49	<compile-dependency/>	49	<compile-dependency/>
50	<run-dependency>	50	<run-dependency>
51	<release-version>1</release-version>	51	<release-version>2</release-version>
52	<specification-version>1.11</specification-version>	52	<specification-version>2.1</specification-version>
53	</run-dependency>	53	</run-dependency>
54	</dependency>	54	</dependency>
55	<dependency>	55	<dependency>

Lines 41-47 Link Here

(-)a/scala.core/src/org/netbeans/api/language/util/ast/AstItem.scala (-1 / +1 lines)
41	import javax.swing.Icon	41	import javax.swing.Icon
42	import org.netbeans.api.lexer.{Token, TokenId, TokenHierarchy}	42	import org.netbeans.api.lexer.{Token, TokenId, TokenHierarchy}
43	import org.netbeans.modules.csl.api.{ElementKind, ElementHandle, Modifier, OffsetRange}	43	import org.netbeans.modules.csl.api.{ElementKind, ElementHandle, Modifier, OffsetRange}
44	import org.netbeans.modules.csl.core.UiUtils	44	import org.netbeans.modules.csl.api.UiUtils
45	import org.netbeans.modules.csl.spi.{ParserResult}	45	import org.netbeans.modules.csl.spi.{ParserResult}
46	import org.openide.filesystems.{FileObject}	46	import org.openide.filesystems.{FileObject}
47		47

Lines 39-45 Link Here

(-)a/scala.core/src/org/netbeans/modules/scala/core/element/JavaElements.scala (-1 / +1 lines)
39	package org.netbeans.modules.scala.core.element	39	package org.netbeans.modules.scala.core.element
40		40
41	import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, HtmlFormatter, OffsetRange}	41	import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, HtmlFormatter, OffsetRange}
42	import org.netbeans.modules.csl.core.UiUtils	42	import org.netbeans.modules.csl.api.UiUtils
43	import org.netbeans.modules.csl.spi.ParserResult	43	import org.netbeans.modules.csl.spi.ParserResult
44	import org.openide.filesystems.FileObject	44	import org.openide.filesystems.FileObject
45		45

Lines 46-52 Link Here

(-)a/scala.core/src/org/netbeans/modules/scala/core/element/ScalaElements.scala (-1 / +1 lines)
46	import org.netbeans.api.lexer.TokenHierarchy	46	import org.netbeans.api.lexer.TokenHierarchy
47	import org.netbeans.editor.BaseDocument	47	import org.netbeans.editor.BaseDocument
48	import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, OffsetRange, HtmlFormatter}	48	import org.netbeans.modules.csl.api.{ElementHandle, ElementKind, Modifier, OffsetRange, HtmlFormatter}
49	import org.netbeans.modules.csl.core.UiUtils	49	import org.netbeans.modules.csl.api.UiUtils
50	import org.netbeans.modules.csl.spi.{GsfUtilities, ParserResult}	50	import org.netbeans.modules.csl.spi.{GsfUtilities, ParserResult}
51	import org.openide.filesystems.{FileObject}	51	import org.openide.filesystems.{FileObject}
52	import org.openide.util.Exceptions	52	import org.openide.util.Exceptions

Lines 3-7 Link Here

(-)a/scala.debugger.projects/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.scala.debugger.projects	3	OpenIDE-Module: org.netbeans.modules.scala.debugger.projects
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/debugger/projects/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/debugger/projects/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/scala/debugger/projects/resources/mf-layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/scala/debugger/projects/resources/mf-layer.xml
6	OpenIDE-Module-Specification-Version: 0.15	6	OpenIDE-Module-Specification-Version: 0.16
7		7

Lines 61-68 Link Here

(-)a/scala.debugger.projects/nbproject/project.xml (-2 / +2 lines)
61	<build-prerequisite/>	61	<build-prerequisite/>
62	<compile-dependency/>	62	<compile-dependency/>
63	<run-dependency>	63	<run-dependency>
64	<release-version>1</release-version>	64	<release-version>2</release-version>
65	<specification-version>1.9</specification-version>	65	<specification-version>2.1</specification-version>
66	</run-dependency>	66	</run-dependency>
67	</dependency>	67	</dependency>
68	<dependency>	68	<dependency>

Lines 1-4 Link Here

(-)a/scala.editor/nbproject/project.properties (-1 / +1 lines)
1	spec.version.base=0.2.0	1	spec.version.base=0.3.0
2		2
3	auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true	3	auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
4	auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2	4	auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2

Lines 57-63 Link Here

(-)a/scala.editor/nbproject/project.xml (-1 / +1 lines)
57	<build-prerequisite/>	57	<build-prerequisite/>
58	<compile-dependency/>	58	<compile-dependency/>
59	<run-dependency>	59	<run-dependency>
60	<release-version>1</release-version>	60	<release-version>2</release-version>
61	<implementation-version/>	61	<implementation-version/>
62	</run-dependency>	62	</run-dependency>
63	</dependency>	63	</dependency>

Lines 45-51 Link Here

(-)a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/ElementDescription.scala (-1 / +1 lines)
45	import org.openide.util.NbBundle	45	import org.openide.util.NbBundle
46		46
47	import org.netbeans.modules.csl.api.Modifier	47	import org.netbeans.modules.csl.api.Modifier
48	import org.netbeans.modules.csl.core.UiUtils	48	import org.netbeans.modules.csl.api.UiUtils
49	import org.netbeans.modules.scala.core.ScalaParserResult	49	import org.netbeans.modules.scala.core.ScalaParserResult
50	import org.netbeans.modules.scala.core.element.ScalaElements	50	import org.netbeans.modules.scala.core.element.ScalaElements
51		51

Lines 46-52 Link Here

(-)a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotation.scala (-1 / +1 lines)
46	import javax.swing.text.JTextComponent	46	import javax.swing.text.JTextComponent
47	import javax.swing.text.Position	47	import javax.swing.text.Position
48	import javax.swing.text.StyledDocument	48	import javax.swing.text.StyledDocument
49	import org.netbeans.modules.csl.core.UiUtils	49	import org.netbeans.modules.csl.api.UiUtils
50	import org.openide.filesystems.FileObject	50	import org.openide.filesystems.FileObject
51	import org.openide.text.Annotation	51	import org.openide.text.Annotation
52	import org.openide.text.NbDocument	52	import org.openide.text.NbDocument




 */
package org.netbeans.modules.scala.editor.overridden

import org.netbeans.modules.csl.core.AbstractTaskFactory
import org.netbeans.modules.csl.core.Language
import org.netbeans.modules.parsing.api.Snapshot
import org.netbeans.modules.parsing.spi.SchedulerTask
import org.netbeans.modules.parsing.spi.TaskFactory

/**
 * 
 * @author Caoyuan Deng
 */
class IsOverriddenAnnotationHandlerFactory extends TaskFactory() { // XXX: Phase.RESOLVED, Priority.BELOW_NORMAL

  override def create(snapshot: Snapshot): java.util.Collection[_ <: SchedulerTask] = {
    java.util.Collections.singleton(new IsOverriddenAnnotationHandler(snapshot.getSource.getFileObject))
  }


Lines 57-63 Link Here

(-)a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenPopup.scala (-1 / +1 lines)
57	import org.netbeans.api.java.source.JavaSource;	57	import org.netbeans.api.java.source.JavaSource;
58	import org.netbeans.api.java.source.SourceUtils;	58	import org.netbeans.api.java.source.SourceUtils;
59	import org.netbeans.api.java.source.ui.ElementOpen;	59	import org.netbeans.api.java.source.ui.ElementOpen;
60	import org.netbeans.modules.csl.core.UiUtils	60	import org.netbeans.modules.csl.api.UiUtils
61	import org.openide.filesystems.FileObject;	61	import org.openide.filesystems.FileObject;
62		62
63	/**	63	/**

Lines 3-7 Link Here

(-)a/scala.project/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.scala.project	3	OpenIDE-Module: org.netbeans.modules.scala.project
4	OpenIDE-Module-Layer: org/netbeans/modules/scala/project/ui/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/scala/project/ui/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/project/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/project/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.3.4	6	OpenIDE-Module-Specification-Version: 1.4
7		7

Lines 117-124 Link Here

(-)a/scala.project/nbproject/project.xml (-2 / +2 lines)
117	<build-prerequisite/>	117	<build-prerequisite/>
118	<compile-dependency/>	118	<compile-dependency/>
119	<run-dependency>	119	<run-dependency>
120	<release-version>1</release-version>	120	<release-version>2</release-version>
121	<specification-version>1.9</specification-version>	121	<specification-version>2.1</specification-version>
122	</run-dependency>	122	</run-dependency>
123	</dependency>	123	</dependency>
124	<dependency>	124	<dependency>

Lines 3-6 Link Here

(-)a/scala.refactoring/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.scala.refactoring	3	OpenIDE-Module: org.netbeans.modules.scala.refactoring
4	OpenIDE-Module-Layer: org/netbeans/modules/scala/refactoring/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/scala/refactoring/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/refactoring/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/scala/refactoring/Bundle.properties
6	OpenIDE-Module-Specification-Version: 0.3	6	OpenIDE-Module-Specification-Version: 0.4

Lines 54-61 Link Here

(-)a/scala.refactoring/nbproject/project.xml (-2 / +2 lines)
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
57	<release-version>1</release-version>	57	<release-version>2</release-version>
58	<specification-version>1.8</specification-version>	58	<specification-version>2.1</specification-version>
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>

Lines 58-64 Link Here

(-)a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/WhereUsedQueryPlugin.scala (-1 / +1 lines)
58	import org.netbeans.api.lexer.TokenSequence;	58	import org.netbeans.api.lexer.TokenSequence;
59	import org.netbeans.api.lexer.TokenUtilities;	59	import org.netbeans.api.lexer.TokenUtilities;
60	import org.netbeans.editor.BaseDocument;	60	import org.netbeans.editor.BaseDocument;
61	import org.netbeans.modules.csl.core.UiUtils	61	import org.netbeans.modules.csl.api.UiUtils
62	import org.netbeans.modules.csl.spi.GsfUtilities;	62	import org.netbeans.modules.csl.spi.GsfUtilities;
63	import org.netbeans.modules.csl.spi.support.ModificationResult;	63	import org.netbeans.modules.csl.spi.support.ModificationResult;
64	import org.netbeans.modules.parsing.api.Source	64	import org.netbeans.modules.parsing.api.Source

Lines 49-55 Link Here

(-)a/scala.refactoring/src/org/netbeans/modules/scala/refactoring/ui/tree/FolderTreeElement.scala (-1 / +1 lines)
49	import org.netbeans.api.project.ProjectUtils;	49	import org.netbeans.api.project.ProjectUtils;
50	import org.netbeans.api.project.SourceGroup;	50	import org.netbeans.api.project.SourceGroup;
51	import org.netbeans.api.project.Sources	51	import org.netbeans.api.project.Sources
52	import org.netbeans.modules.csl.core.UiUtils	52	import org.netbeans.modules.csl.api.UiUtils
53	import org.netbeans.modules.refactoring.spi.ui.TreeElement	53	import org.netbeans.modules.refactoring.spi.ui.TreeElement
54	import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory	54	import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory
55	import org.openide.filesystems.FileObject;	55	import org.openide.filesystems.FileObject;

Return to bug 169991

Lines 40-57 Link Here

(-)a/scala.editor/src/org/netbeans/modules/scala/editor/overridden/IsOverriddenAnnotationHandlerFactory.scala (-4 / +3 lines)
40	*/	40	*/
41	package org.netbeans.modules.scala.editor.overridden	41	package org.netbeans.modules.scala.editor.overridden
42		42
43	import org.netbeans.modules.csl.core.AbstractTaskFactory
44	import org.netbeans.modules.csl.core.Language
45	import org.netbeans.modules.parsing.api.Snapshot	43	import org.netbeans.modules.parsing.api.Snapshot
46	import org.netbeans.modules.parsing.spi.SchedulerTask	44	import org.netbeans.modules.parsing.spi.SchedulerTask
		45	import org.netbeans.modules.parsing.spi.TaskFactory
47		46
48	/**	47	/**
49	*	48	*
50	* @author Caoyuan Deng	49	* @author Caoyuan Deng
51	*/	50	*/
52	class IsOverriddenAnnotationHandlerFactory extends AbstractTaskFactory(true) { // XXX: Phase.RESOLVED, Priority.BELOW_NORMAL	51	class IsOverriddenAnnotationHandlerFactory extends TaskFactory() { // XXX: Phase.RESOLVED, Priority.BELOW_NORMAL
53		52
54	override def createTasks(l: Language, snapshot: Snapshot): java.util.Collection[_ <: SchedulerTask] = {	53	override def create(snapshot: Snapshot): java.util.Collection[_ <: SchedulerTask] = {
55	java.util.Collections.singleton(new IsOverriddenAnnotationHandler(snapshot.getSource.getFileObject))	54	java.util.Collections.singleton(new IsOverriddenAnnotationHandler(snapshot.getSource.getFileObject))
56	}	55	}
57		56