diff --git a/csl.api/manifest.mf b/csl.api/manifest.mf --- a/csl.api/manifest.mf +++ b/csl.api/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 -OpenIDE-Module: org.netbeans.modules.csl.api/1 -OpenIDE-Module-Implementation-Version: 1 +OpenIDE-Module: org.netbeans.modules.csl.api/2 +OpenIDE-Module-Implementation-Version: 2 OpenIDE-Module-Layer: org/netbeans/modules/csl/core/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/csl/api/Bundle.properties AutoUpdate-Show-In-Client: false diff --git a/csl.api/nbproject/project.properties b/csl.api/nbproject/project.properties --- a/csl.api/nbproject/project.properties +++ b/csl.api/nbproject/project.properties @@ -37,7 +37,7 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. -spec.version.base=1.19.0 +spec.version.base=1.20.0 is.autoload=true javac.source=1.6 diff --git a/csl.api/src/org/netbeans/modules/csl/core/AbstractCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/AbstractCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/AbstractCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/AbstractCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/AbstractCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/AbstractCamelCasePosition.java @@ -38,7 +38,7 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import java.awt.event.ActionEvent; import java.util.MissingResourceException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/CamelCaseOperations.java b/csl.api/src/org/netbeans/modules/csl/api/CamelCaseOperations.java rename from csl.api/src/org/netbeans/modules/csl/core/CamelCaseOperations.java rename to csl.api/src/org/netbeans/modules/csl/api/CamelCaseOperations.java --- a/csl.api/src/org/netbeans/modules/csl/core/CamelCaseOperations.java +++ b/csl.api/src/org/netbeans/modules/csl/api/CamelCaseOperations.java @@ -39,12 +39,11 @@ * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.JTextComponent; -import org.netbeans.modules.csl.api.KeystrokeHandler; import org.netbeans.editor.BaseDocument; import org.netbeans.editor.Utilities; import org.openide.ErrorManager; @@ -67,7 +66,7 @@ return -1; } - KeystrokeHandler bc = CslEditorKit.getBracketCompletion(doc, offset); + KeystrokeHandler bc = UiUtils.getBracketCompletion(doc, offset); if (bc != null) { int nextOffset = bc.getNextWordOffset(doc, offset, false); if (nextOffset != -1) { @@ -94,7 +93,7 @@ final Document doc = textComponent.getDocument(); - KeystrokeHandler bc = CslEditorKit.getBracketCompletion(doc, offset); + KeystrokeHandler bc = UiUtils.getBracketCompletion(doc, offset); if (bc != null) { int nextOffset = bc.getNextWordOffset( doc, offset, true); diff --git a/csl.api/src/org/netbeans/modules/csl/core/DeleteToNextCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/DeleteToNextCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/DeleteToNextCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/DeleteToNextCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/DeleteToNextCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/DeleteToNextCamelCasePosition.java @@ -25,7 +25,7 @@ * * Portions Copyrighted 2007 Sun Microsystems, Inc. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/DeleteToPreviousCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/DeleteToPreviousCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/DeleteToPreviousCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/DeleteToPreviousCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/DeleteToPreviousCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/DeleteToPreviousCamelCasePosition.java @@ -38,7 +38,7 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/editor/InstantRenameAction.java b/csl.api/src/org/netbeans/modules/csl/api/InstantRenameAction.java rename from csl.api/src/org/netbeans/modules/csl/editor/InstantRenameAction.java rename to csl.api/src/org/netbeans/modules/csl/api/InstantRenameAction.java --- a/csl.api/src/org/netbeans/modules/csl/editor/InstantRenameAction.java +++ b/csl.api/src/org/netbeans/modules/csl/api/InstantRenameAction.java @@ -38,7 +38,7 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.editor; +package org.netbeans.modules.csl.api; import java.awt.event.ActionEvent; import java.io.IOException; @@ -51,8 +51,6 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; -import org.netbeans.modules.csl.api.InstantRenamer; -import org.netbeans.modules.csl.api.OffsetRange; import org.netbeans.modules.parsing.api.Source; import org.netbeans.modules.parsing.api.UserTask; import org.netbeans.modules.parsing.spi.ParseException; @@ -61,7 +59,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.modules.csl.core.Language; import org.netbeans.modules.csl.core.LanguageRegistry; -import org.netbeans.modules.csl.api.DataLoadersBridge; +import org.netbeans.modules.csl.editor.InstantRenamePerformer; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.parsing.api.ParserManager; import org.netbeans.modules.parsing.api.ResultIterator; @@ -93,7 +91,7 @@ super("in-place-refactoring", MAGIC_POSITION_RESET | UNDO_MERGE_RESET); } - public void actionPerformed(ActionEvent evt, final JTextComponent target) { + public @Override void actionPerformed(ActionEvent evt, final JTextComponent target) { try { final int caret = target.getCaretPosition(); String ident = Utilities.getIdentifier(Utilities.getDocument(target), caret); @@ -120,7 +118,7 @@ ParserManager.parse ( Collections. singleton (js), new UserTask () { - public void run (ResultIterator resultIterator) throws Exception { + public @Override void run (ResultIterator resultIterator) throws Exception { Parser.Result result = resultIterator.getParserResult (target.getCaretPosition ()); if(!(result instanceof ParserResult)) { return ; diff --git a/csl.api/src/org/netbeans/modules/csl/core/NextCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/NextCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/NextCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/NextCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/NextCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/NextCamelCasePosition.java @@ -25,7 +25,7 @@ * * Portions Copyrighted 2007 Sun Microsystems, Inc. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/PreviousCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/PreviousCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/PreviousCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/PreviousCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/PreviousCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/PreviousCamelCasePosition.java @@ -38,7 +38,7 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/SelectCodeElementAction.java b/csl.api/src/org/netbeans/modules/csl/api/SelectCodeElementAction.java rename from csl.api/src/org/netbeans/modules/csl/core/SelectCodeElementAction.java rename to csl.api/src/org/netbeans/modules/csl/api/SelectCodeElementAction.java --- a/csl.api/src/org/netbeans/modules/csl/core/SelectCodeElementAction.java +++ b/csl.api/src/org/netbeans/modules/csl/api/SelectCodeElementAction.java @@ -39,7 +39,7 @@ * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import java.awt.event.ActionEvent; import java.util.Collections; @@ -52,10 +52,10 @@ import javax.swing.text.Document; import javax.swing.text.JTextComponent; -import org.netbeans.modules.csl.api.OffsetRange; import org.netbeans.editor.BaseAction; import org.netbeans.editor.BaseDocument; -import org.netbeans.modules.csl.api.KeystrokeHandler; +import org.netbeans.modules.csl.core.Language; +import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.parsing.api.ParserManager; import org.netbeans.modules.parsing.api.ResultIterator; diff --git a/csl.api/src/org/netbeans/modules/csl/core/SelectNextCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/SelectNextCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/SelectNextCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/SelectNextCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/SelectNextCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/SelectNextCamelCasePosition.java @@ -25,7 +25,7 @@ * * Portions Copyrighted 2007 Sun Microsystems, Inc. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/SelectPreviousCamelCasePosition.java b/csl.api/src/org/netbeans/modules/csl/api/SelectPreviousCamelCasePosition.java rename from csl.api/src/org/netbeans/modules/csl/core/SelectPreviousCamelCasePosition.java rename to csl.api/src/org/netbeans/modules/csl/api/SelectPreviousCamelCasePosition.java --- a/csl.api/src/org/netbeans/modules/csl/core/SelectPreviousCamelCasePosition.java +++ b/csl.api/src/org/netbeans/modules/csl/api/SelectPreviousCamelCasePosition.java @@ -38,7 +38,7 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import javax.swing.Action; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/editor/ToggleBlockCommentAction.java b/csl.api/src/org/netbeans/modules/csl/api/ToggleBlockCommentAction.java rename from csl.api/src/org/netbeans/modules/csl/editor/ToggleBlockCommentAction.java rename to csl.api/src/org/netbeans/modules/csl/api/ToggleBlockCommentAction.java --- a/csl.api/src/org/netbeans/modules/csl/editor/ToggleBlockCommentAction.java +++ b/csl.api/src/org/netbeans/modules/csl/api/ToggleBlockCommentAction.java @@ -36,7 +36,7 @@ * * Portions Copyrighted 2008 Sun Microsystems, Inc. */ -package org.netbeans.modules.csl.editor; +package org.netbeans.modules.csl.api; import java.awt.event.ActionEvent; import javax.swing.text.BadLocationException; diff --git a/csl.api/src/org/netbeans/modules/csl/core/UiUtils.java b/csl.api/src/org/netbeans/modules/csl/api/UiUtils.java rename from csl.api/src/org/netbeans/modules/csl/core/UiUtils.java rename to csl.api/src/org/netbeans/modules/csl/api/UiUtils.java --- a/csl.api/src/org/netbeans/modules/csl/core/UiUtils.java +++ b/csl.api/src/org/netbeans/modules/csl/api/UiUtils.java @@ -38,23 +38,23 @@ * Version 2 license, then the option applies only if the new code is * made subject to such option by the copyright holder. */ -package org.netbeans.modules.csl.core; +package org.netbeans.modules.csl.api; import java.io.IOException; import java.util.Collection; import java.util.Collections; +import java.util.List; import java.util.concurrent.Future; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.ImageIcon; import javax.swing.SwingUtilities; +import javax.swing.text.Document; import javax.swing.text.StyledDocument; -import org.netbeans.modules.csl.api.DataLoadersBridge; +import org.netbeans.editor.BaseDocument; import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation; -import org.netbeans.modules.csl.api.ElementHandle; -import org.netbeans.modules.csl.api.ElementKind; -import org.netbeans.modules.csl.api.Modifier; -import org.netbeans.modules.csl.api.OffsetRange; +import org.netbeans.modules.csl.core.Language; +import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.csl.navigation.Icons; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.parsing.api.Embedding; @@ -106,7 +106,7 @@ if (!SwingUtilities.isEventDispatchThread()) { SwingUtilities.invokeLater(new Runnable() { - public void run() { + public @Override void run() { doOpen(fo, offset); } }); @@ -120,6 +120,18 @@ return Icons.getElementIcon(elementKind, modifiers); } + public static KeystrokeHandler getBracketCompletion(Document doc, int offset) { + BaseDocument baseDoc = (BaseDocument)doc; + List list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset); + for (Language l : list) { + if (l.getBracketCompletion() != null) { + return l.getBracketCompletion(); + } + } + + return null; + } + // Private methods --------------------------------------------------------- private static final Logger LOG = Logger.getLogger(UiUtils.class.getName()); @@ -179,7 +191,7 @@ final DeclarationLocation[] result = new DeclarationLocation[] { null }; try { Future f = ParserManager.parseWhenScanFinished(Collections.singleton(source), new UserTask() { - public void run(ResultIterator resultIterator) throws ParseException { + public @Override void run(ResultIterator resultIterator) throws ParseException { if (resultIterator.getSnapshot().getMimeType().equals(handle.getMimeType())) { Parser.Result r = resultIterator.getParserResult(); if (r instanceof ParserResult) { diff --git a/csl.api/src/org/netbeans/modules/csl/core/CslEditorKit.java b/csl.api/src/org/netbeans/modules/csl/core/CslEditorKit.java --- a/csl.api/src/org/netbeans/modules/csl/core/CslEditorKit.java +++ b/csl.api/src/org/netbeans/modules/csl/core/CslEditorKit.java @@ -41,7 +41,6 @@ import java.awt.event.ActionEvent; import java.util.ArrayList; -import java.util.List; import javax.swing.Action; import javax.swing.JMenu; import javax.swing.JMenuItem; @@ -62,11 +61,19 @@ import org.netbeans.editor.ext.ExtKit; import org.netbeans.editor.ext.ExtSyntaxSupport; import org.netbeans.lib.editor.codetemplates.api.CodeTemplateManager; +import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition; +import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition; import org.netbeans.modules.csl.api.GsfLanguage; +import org.netbeans.modules.csl.api.InstantRenameAction; import org.netbeans.modules.csl.api.KeystrokeHandler; +import org.netbeans.modules.csl.api.NextCamelCasePosition; import org.netbeans.modules.csl.api.OffsetRange; -import org.netbeans.modules.csl.editor.InstantRenameAction; -import org.netbeans.modules.csl.editor.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.PreviousCamelCasePosition; +import org.netbeans.modules.csl.api.SelectCodeElementAction; +import org.netbeans.modules.csl.api.SelectNextCamelCasePosition; +import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition; +import org.netbeans.modules.csl.api.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.editor.hyperlink.GoToSupport; import org.netbeans.modules.csl.editor.semantic.GoToMarkOccurrencesAction; import org.netbeans.modules.csl.spi.CommentHandler; @@ -125,7 +132,7 @@ public int[] findMatchingBlock(int offset, boolean simpleSearch) throws BadLocationException { // Do parenthesis matching, if applicable - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, offset); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, offset); if (bracketCompletion != null) { OffsetRange range = bracketCompletion.findMatching(getDocument(), offset/*, simpleSearch*/); if (range == OffsetRange.NONE) { @@ -218,18 +225,6 @@ return null; } - /* package */ static KeystrokeHandler getBracketCompletion(Document doc, int offset) { - BaseDocument baseDoc = (BaseDocument)doc; - List list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset); - for (Language l : list) { - if (l.getBracketCompletion() != null) { - return l.getBracketCompletion(); - } - } - - return null; - } - /** * Returns true if bracket completion is enabled in options. */ @@ -252,7 +247,7 @@ protected void insertString(BaseDocument doc, int dotPos, Caret caret, String str, boolean overwrite) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { // TODO - check if we're in a comment etc. and if so, do nothing @@ -283,7 +278,7 @@ BaseDocument doc = (BaseDocument)document; if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { try { @@ -327,7 +322,7 @@ @Override protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot()); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot()); if (bracketCompletion != null) { try { @@ -384,7 +379,7 @@ protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch); diff --git a/csl.api/src/org/netbeans/modules/csl/core/TypeAndSymbolProvider.java b/csl.api/src/org/netbeans/modules/csl/core/TypeAndSymbolProvider.java --- a/csl.api/src/org/netbeans/modules/csl/core/TypeAndSymbolProvider.java +++ b/csl.api/src/org/netbeans/modules/csl/core/TypeAndSymbolProvider.java @@ -47,6 +47,7 @@ import org.netbeans.api.project.Project; import org.netbeans.modules.csl.api.ElementHandle; import org.netbeans.modules.csl.api.IndexSearcher; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.navigation.Icons; import org.netbeans.modules.parsing.api.Source; import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport; diff --git a/csl.api/src/org/netbeans/modules/csl/editor/completion/GsfCompletionDoc.java b/csl.api/src/org/netbeans/modules/csl/editor/completion/GsfCompletionDoc.java --- a/csl.api/src/org/netbeans/modules/csl/editor/completion/GsfCompletionDoc.java +++ b/csl.api/src/org/netbeans/modules/csl/editor/completion/GsfCompletionDoc.java @@ -52,10 +52,10 @@ import org.netbeans.api.editor.completion.Completion; import org.netbeans.modules.csl.api.CodeCompletionHandler; import org.netbeans.modules.csl.api.ElementHandle; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.UiUtils; import org.netbeans.spi.editor.completion.CompletionDocumentation; import org.openide.awt.HtmlBrowser; import org.openide.util.Exceptions; diff --git a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/DeclarationPopup.java b/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/DeclarationPopup.java --- a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/DeclarationPopup.java +++ b/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/DeclarationPopup.java @@ -57,8 +57,8 @@ import org.netbeans.modules.csl.api.DeclarationFinder.AlternativeLocation; import org.netbeans.modules.csl.api.DeclarationFinder.DeclarationLocation; import org.netbeans.modules.csl.api.ElementHandle; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.core.GsfHtmlFormatter; -import org.netbeans.modules.csl.core.UiUtils; import org.netbeans.modules.csl.navigation.Icons; import org.openide.awt.StatusDisplayer; import org.openide.filesystems.FileObject; diff --git a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java b/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java --- a/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java +++ b/csl.api/src/org/netbeans/modules/csl/editor/hyperlink/GoToSupport.java @@ -64,10 +64,10 @@ import org.netbeans.modules.csl.api.OffsetRange; import org.netbeans.modules.csl.api.CodeCompletionHandler; import org.netbeans.modules.csl.api.ElementHandle; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.core.GsfHtmlFormatter; import org.netbeans.modules.csl.core.Language; import org.netbeans.modules.csl.core.LanguageRegistry; -import org.netbeans.modules.csl.core.UiUtils; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.parsing.api.ParserManager; import org.netbeans.modules.parsing.api.ResultIterator; diff --git a/csl.api/src/org/netbeans/modules/csl/navigation/actions/OpenAction.java b/csl.api/src/org/netbeans/modules/csl/navigation/actions/OpenAction.java --- a/csl.api/src/org/netbeans/modules/csl/navigation/actions/OpenAction.java +++ b/csl.api/src/org/netbeans/modules/csl/navigation/actions/OpenAction.java @@ -47,7 +47,7 @@ import java.awt.event.*; import org.netbeans.modules.csl.api.DataLoadersBridge; import org.netbeans.modules.csl.api.ElementHandle; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.parsing.api.Source; /** diff --git a/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java b/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java --- a/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java +++ b/csl.api/test/unit/src/org/netbeans/modules/csl/api/test/CslTestBase.java @@ -3992,6 +3992,49 @@ assertDescriptionMatches(relFilePath, fixed, true, ".fixed"); } + @SuppressWarnings("unchecked") + protected final void ensureRegistered(AstRule hint) throws Exception { + org.netbeans.modules.csl.core.Language language = LanguageRegistry.getInstance().getLanguageByMimeType(getPreferredMimeType()); + assertNotNull(language.getHintsProvider()); + GsfHintsManager hintsManager = language.getHintsManager(); + Map> hints = (Map>)hintsManager.getHints(); + Set kinds = hint.getKinds(); + for (Object nodeType : kinds) { + List rules = hints.get(nodeType); + assertNotNull(rules); + boolean found = false; + for (AstRule rule : rules) { + if (rule.getClass() == hint.getClass()) { + found = true; + break; + } + } + + assertTrue(found); + } + } + + @SuppressWarnings("unchecked") + protected final void ensureRegistered(ErrorRule hint) throws Exception { + org.netbeans.modules.csl.core.Language language = LanguageRegistry.getInstance().getLanguageByMimeType(getPreferredMimeType()); + assertNotNull(language.getHintsProvider()); + GsfHintsManager hintsManager = language.getHintsManager(); + Map> hints = (Map>)hintsManager.getErrors(); + Set kinds = hint.getCodes(); + for (Object codes : kinds) { + List rules = hints.get(codes); + assertNotNull(rules); + boolean found = false; + for (ErrorRule rule : rules) { + if (rule.getClass() == hint.getClass()) { + found = true; + break; + } + } + + assertTrue(found); + } + } // public void ensureRegistered(AstRule hint) throws Exception { // Map> hints = JsRulesManager.getInstance().getHints(); // Set kinds = hint.getKinds(); diff --git a/css.editor/manifest.mf b/css.editor/manifest.mf --- a/css.editor/manifest.mf +++ b/css.editor/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.css.editor/1 OpenIDE-Module-Layer: org/netbeans/modules/css/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/css/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.9 +OpenIDE-Module-Specification-Version: 1.10 AutoUpdate-Show-In-Client: false diff --git a/css.editor/nbproject/project.xml b/css.editor/nbproject/project.xml --- a/css.editor/nbproject/project.xml +++ b/css.editor/nbproject/project.xml @@ -10,8 +10,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/css.visual/manifest.mf b/css.visual/manifest.mf --- a/css.visual/manifest.mf +++ b/css.visual/manifest.mf @@ -5,4 +5,4 @@ OpenIDE-Module-Install: org/netbeans/modules/css/CssModuleInstall.class OpenIDE-Module-Requires: org.openide.windows.IOProvider AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 2.10 +OpenIDE-Module-Specification-Version: 2.11 diff --git a/css.visual/nbproject/project.xml b/css.visual/nbproject/project.xml --- a/css.visual/nbproject/project.xml +++ b/css.visual/nbproject/project.xml @@ -69,8 +69,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/groovy.editor/manifest.mf b/groovy.editor/manifest.mf --- a/groovy.editor/manifest.mf +++ b/groovy.editor/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.groovy.editor/2 OpenIDE-Module-Layer: org/netbeans/modules/groovy/editor/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/editor/Bundle.properties -OpenIDE-Module-Specification-Version: 1.18 +OpenIDE-Module-Specification-Version: 1.19 diff --git a/groovy.editor/nbproject/project.xml b/groovy.editor/nbproject/project.xml --- a/groovy.editor/nbproject/project.xml +++ b/groovy.editor/nbproject/project.xml @@ -54,8 +54,8 @@ - 0-1 - 1.19 + 2 + 1.20 diff --git a/groovy.grailsproject/manifest.mf b/groovy.grailsproject/manifest.mf --- a/groovy.grailsproject/manifest.mf +++ b/groovy.grailsproject/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.groovy.grailsproject OpenIDE-Module-Layer: org/netbeans/modules/groovy/grailsproject/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/grailsproject/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.21 +OpenIDE-Module-Specification-Version: 1.22 diff --git a/groovy.grailsproject/nbproject/project.xml b/groovy.grailsproject/nbproject/project.xml --- a/groovy.grailsproject/nbproject/project.xml +++ b/groovy.grailsproject/nbproject/project.xml @@ -55,8 +55,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/groovy.gsp/manifest.mf b/groovy.gsp/manifest.mf --- a/groovy.gsp/manifest.mf +++ b/groovy.gsp/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.groovy.gsp OpenIDE-Module-Layer: org/netbeans/modules/groovy/gsp/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/gsp/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.12 +OpenIDE-Module-Specification-Version: 1.13 diff --git a/groovy.gsp/nbproject/project.xml b/groovy.gsp/nbproject/project.xml --- a/groovy.gsp/nbproject/project.xml +++ b/groovy.gsp/nbproject/project.xml @@ -90,8 +90,8 @@ - 0-1 - 1.19 + 2 + 1.20 diff --git a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java b/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java --- a/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java +++ b/groovy.gsp/src/org/netbeans/modules/groovy/gsp/editor/GspKit.java @@ -56,14 +56,14 @@ import org.netbeans.lib.editor.util.swing.DocumentUtilities; import org.netbeans.editor.Utilities; import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction; -import org.netbeans.modules.csl.core.DeleteToNextCamelCasePosition; -import org.netbeans.modules.csl.core.DeleteToPreviousCamelCasePosition; -import org.netbeans.modules.csl.core.NextCamelCasePosition; -import org.netbeans.modules.csl.core.PreviousCamelCasePosition; -import org.netbeans.modules.csl.core.SelectCodeElementAction; -import org.netbeans.modules.csl.core.SelectNextCamelCasePosition; -import org.netbeans.modules.csl.core.SelectPreviousCamelCasePosition; -import org.netbeans.modules.csl.editor.InstantRenameAction; +import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition; +import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition; +import org.netbeans.modules.csl.api.InstantRenameAction; +import org.netbeans.modules.csl.api.NextCamelCasePosition; +import org.netbeans.modules.csl.api.PreviousCamelCasePosition; +import org.netbeans.modules.csl.api.SelectCodeElementAction; +import org.netbeans.modules.csl.api.SelectNextCamelCasePosition; +import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition; import org.netbeans.modules.html.editor.api.HtmlKit; import org.netbeans.modules.groovy.gsp.lexer.GspTokenId; import org.openide.util.Exceptions; diff --git a/groovy.refactoring/manifest.mf b/groovy.refactoring/manifest.mf --- a/groovy.refactoring/manifest.mf +++ b/groovy.refactoring/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.groovy.refactoring OpenIDE-Module-Layer: org/netbeans/modules/groovy/refactoring/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/refactoring/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.11 +OpenIDE-Module-Specification-Version: 1.12 diff --git a/groovy.refactoring/nbproject/project.xml b/groovy.refactoring/nbproject/project.xml --- a/groovy.refactoring/nbproject/project.xml +++ b/groovy.refactoring/nbproject/project.xml @@ -27,8 +27,8 @@ - 0-1 - 1.8 + 2 + 1.20 diff --git a/gsf.codecoverage/manifest.mf b/gsf.codecoverage/manifest.mf --- a/gsf.codecoverage/manifest.mf +++ b/gsf.codecoverage/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.gsf.codecoverage OpenIDE-Module-Layer: org/netbeans/modules/gsf/codecoverage/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/gsf/codecoverage/Bundle.properties -OpenIDE-Module-Specification-Version: 1.6 +OpenIDE-Module-Specification-Version: 1.7 AutoUpdate-Show-In-Client: false diff --git a/gsf.codecoverage/nbproject/project.xml b/gsf.codecoverage/nbproject/project.xml --- a/gsf.codecoverage/nbproject/project.xml +++ b/gsf.codecoverage/nbproject/project.xml @@ -19,8 +19,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/html.editor/manifest.mf b/html.editor/manifest.mf --- a/html.editor/manifest.mf +++ b/html.editor/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.html.editor/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/editor/resources/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/html/editor/resources/layer.xml -OpenIDE-Module-Specification-Version: 1.19 +OpenIDE-Module-Specification-Version: 1.20 AutoUpdate-Show-In-Client: false diff --git a/html.editor/nbproject/project.xml b/html.editor/nbproject/project.xml --- a/html.editor/nbproject/project.xml +++ b/html.editor/nbproject/project.xml @@ -51,8 +51,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/html.editor/src/org/netbeans/modules/html/editor/api/HtmlKit.java b/html.editor/src/org/netbeans/modules/html/editor/api/HtmlKit.java --- a/html.editor/src/org/netbeans/modules/html/editor/api/HtmlKit.java +++ b/html.editor/src/org/netbeans/modules/html/editor/api/HtmlKit.java @@ -51,7 +51,6 @@ import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; -import java.util.List; import javax.swing.Action; import javax.swing.JComponent; import javax.swing.JEditorPane; @@ -69,12 +68,11 @@ import org.netbeans.editor.BaseKit.DeleteCharAction; import org.netbeans.editor.ext.ExtKit; import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction; +import org.netbeans.modules.csl.api.InstantRenameAction; import org.netbeans.modules.csl.api.KeystrokeHandler; -import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.LanguageRegistry; -import org.netbeans.modules.csl.core.SelectCodeElementAction; -import org.netbeans.modules.csl.editor.InstantRenameAction; -import org.netbeans.modules.csl.editor.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.SelectCodeElementAction; +import org.netbeans.modules.csl.api.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.editor.NbEditorKit; import org.netbeans.modules.html.editor.gsf.HtmlCommentHandler; import org.openide.util.Exceptions; @@ -87,7 +85,7 @@ */ public class HtmlKit extends NbEditorKit implements org.openide.util.HelpCtx.Provider { - public org.openide.util.HelpCtx getHelpCtx() { + public @Override org.openide.util.HelpCtx getHelpCtx() { return new org.openide.util.HelpCtx(HtmlKit.class); } static final long serialVersionUID = -1381945567613910297L; @@ -147,18 +145,6 @@ return TextAction.augmentList(super.createActions(), HtmlActions); } - static KeystrokeHandler getBracketCompletion(Document doc, int offset) { - BaseDocument baseDoc = (BaseDocument) doc; - List list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset); - for (Language l : list) { - if (l.getBracketCompletion() != null) { - return l.getBracketCompletion(); - } - } - - return null; - } - /** * Returns true if bracket completion is enabled in options. */ @@ -174,7 +160,7 @@ @Override protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot()); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot()); if (bracketCompletion != null) { try { @@ -230,7 +216,7 @@ boolean overwrite) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { // TODO - check if we're in a comment etc. and if so, do nothing @@ -262,7 +248,7 @@ BaseDocument doc = (BaseDocument) document; if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { try { @@ -323,7 +309,7 @@ @Override protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { boolean success = bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch); diff --git a/html/manifest.mf b/html/manifest.mf --- a/html/manifest.mf +++ b/html/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.html/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/html/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/html/mf-layer.xml -OpenIDE-Module-Specification-Version: 1.30 +OpenIDE-Module-Specification-Version: 1.31 OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker AutoUpdate-Show-In-Client: false diff --git a/html/nbproject/project.xml b/html/nbproject/project.xml --- a/html/nbproject/project.xml +++ b/html/nbproject/project.xml @@ -60,8 +60,8 @@ - 1 - 1.11 + 2 + 1.20 diff --git a/javascript.editing/manifest.mf b/javascript.editing/manifest.mf --- a/javascript.editing/manifest.mf +++ b/javascript.editing/manifest.mf @@ -3,6 +3,6 @@ OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties -OpenIDE-Module-Specification-Version: 0.93 +OpenIDE-Module-Specification-Version: 0.94 AutoUpdate-Show-In-Client: false diff --git a/javascript.editing/nbproject/project.xml b/javascript.editing/nbproject/project.xml --- a/javascript.editing/nbproject/project.xml +++ b/javascript.editing/nbproject/project.xml @@ -55,8 +55,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/javascript.hints/manifest.mf b/javascript.hints/manifest.mf --- a/javascript.hints/manifest.mf +++ b/javascript.hints/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.javascript.hints/1 -OpenIDE-Module-Specification-Version: 0.43 +OpenIDE-Module-Specification-Version: 0.44 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/hints/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/javascript/hints/layer.xml AutoUpdate-Show-In-Client: false diff --git a/javascript.hints/nbproject/project.xml b/javascript.hints/nbproject/project.xml --- a/javascript.hints/nbproject/project.xml +++ b/javascript.hints/nbproject/project.xml @@ -28,8 +28,8 @@ - 1 - 1.0 + 2 + 1.20 @@ -206,6 +206,10 @@ + org.netbeans.libs.junit4 + + + org.netbeans.modules.csl.api @@ -233,10 +237,6 @@ - org.netbeans.modules.lexer.nbbridge - - - org.netbeans.modules.editor.settings.storage @@ -273,10 +273,19 @@ + org.netbeans.modules.lexer.nbbridge + + + org.netbeans.modules.masterfs + org.netbeans.modules.nbjunit + + + + org.netbeans.modules.progress.ui diff --git a/javascript.hints/test/unit/src/org/netbeans/modules/javascript/hints/HintTestBase.java b/javascript.hints/test/unit/src/org/netbeans/modules/javascript/hints/HintTestBase.java --- a/javascript.hints/test/unit/src/org/netbeans/modules/javascript/hints/HintTestBase.java +++ b/javascript.hints/test/unit/src/org/netbeans/modules/javascript/hints/HintTestBase.java @@ -27,17 +27,8 @@ */ package org.netbeans.modules.javascript.hints; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.csl.api.HintsProvider; -import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager; import org.netbeans.modules.javascript.editing.JsTestBase; -import org.netbeans.modules.javascript.editing.lexer.JsTokenId; -import org.netbeans.modules.javascript.hints.infrastructure.JsAstRule; -import org.netbeans.modules.javascript.hints.infrastructure.JsErrorRule; import org.netbeans.modules.javascript.hints.infrastructure.JsHintsProvider; /** @@ -56,47 +47,4 @@ return new JsHintsProvider(); } - @SuppressWarnings("unchecked") - public void ensureRegistered(JsAstRule hint) throws Exception { - Language language = LanguageRegistry.getInstance().getLanguageByMimeType(JsTokenId.JAVASCRIPT_MIME_TYPE); - assertNotNull(language.getHintsProvider()); - GsfHintsManager hintsManager = language.getHintsManager(); - Map> hints = (Map)hintsManager.getHints(); - Set kinds = hint.getKinds(); - for (Integer nodeType : kinds) { - List rules = hints.get(nodeType); - assertNotNull(rules); - boolean found = false; - for (JsAstRule rule : rules) { - if (rule.getClass() == hint.getClass()) { - found = true; - break; - } - } - - assertTrue(found); - } - } - - @SuppressWarnings("unchecked") - public void ensureRegistered(JsErrorRule hint) throws Exception { - Language language = LanguageRegistry.getInstance().getLanguageByMimeType(JsTokenId.JAVASCRIPT_MIME_TYPE); - assertNotNull(language.getHintsProvider()); - GsfHintsManager hintsManager = language.getHintsManager(); - Map> hints = (Map)hintsManager.getErrors(); - Set kinds = hint.getCodes(); - for (String codes : kinds) { - List rules = hints.get(codes); - assertNotNull(rules); - boolean found = false; - for (JsErrorRule rule : rules) { - if (rule.getClass() == hint.getClass()) { - found = true; - break; - } - } - - assertTrue(found); - } - } } diff --git a/javascript.kit/manifest.mf b/javascript.kit/manifest.mf --- a/javascript.kit/manifest.mf +++ b/javascript.kit/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.javascript.kit/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/kit/Bundle.properties -OpenIDE-Module-Specification-Version: 0.109 +OpenIDE-Module-Specification-Version: 0.110 AutoUpdate-Show-In-Client: false diff --git a/javascript.kit/nbproject/project.xml b/javascript.kit/nbproject/project.xml --- a/javascript.kit/nbproject/project.xml +++ b/javascript.kit/nbproject/project.xml @@ -19,8 +19,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/javascript.refactoring/manifest.mf b/javascript.refactoring/manifest.mf --- a/javascript.refactoring/manifest.mf +++ b/javascript.refactoring/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module-Layer: org/netbeans/modules/refactoring/javascript/resources/mf-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/javascript/resources/Bundle.properties AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 0.68 +OpenIDE-Module-Specification-Version: 0.69 diff --git a/javascript.refactoring/nbproject/project.xml b/javascript.refactoring/nbproject/project.xml --- a/javascript.refactoring/nbproject/project.xml +++ b/javascript.refactoring/nbproject/project.xml @@ -37,8 +37,8 @@ - 1 - 1.0 + 2 + 1.20 diff --git a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/WhereUsedElement.java b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/WhereUsedElement.java --- a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/WhereUsedElement.java +++ b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/WhereUsedElement.java @@ -50,7 +50,7 @@ import org.netbeans.modules.csl.api.OffsetRange; import org.netbeans.editor.BaseDocument; import org.netbeans.editor.Utilities; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.GsfUtilities; import org.netbeans.modules.refactoring.javascript.ui.tree.ElementGripFactory; import org.netbeans.modules.refactoring.spi.SimpleRefactoringElementImplementation; diff --git a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/plugins/JsWhereUsedQueryPlugin.java b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/plugins/JsWhereUsedQueryPlugin.java --- a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/plugins/JsWhereUsedQueryPlugin.java +++ b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/plugins/JsWhereUsedQueryPlugin.java @@ -59,7 +59,7 @@ import org.netbeans.api.lexer.TokenSequence; import org.netbeans.api.lexer.TokenUtilities; import org.netbeans.editor.BaseDocument; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.GsfUtilities; import org.netbeans.modules.csl.spi.support.ModificationResult; import org.netbeans.modules.javascript.editing.JsParseResult; diff --git a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/tree/FolderTreeElement.java b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/tree/FolderTreeElement.java --- a/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/tree/FolderTreeElement.java +++ b/javascript.refactoring/src/org/netbeans/modules/refactoring/javascript/ui/tree/FolderTreeElement.java @@ -49,7 +49,7 @@ import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.refactoring.spi.ui.*; import org.openide.filesystems.FileObject; import org.openide.filesystems.FileUtil; diff --git a/languages.yaml/manifest.mf b/languages.yaml/manifest.mf --- a/languages.yaml/manifest.mf +++ b/languages.yaml/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.languages.yaml OpenIDE-Module-Layer: org/netbeans/modules/languages/yaml/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/languages/yaml/Bundle.properties -OpenIDE-Module-Specification-Version: 2.7 +OpenIDE-Module-Specification-Version: 2.8 AutoUpdate-Show-In-Client: false diff --git a/languages.yaml/nbproject/project.xml b/languages.yaml/nbproject/project.xml --- a/languages.yaml/nbproject/project.xml +++ b/languages.yaml/nbproject/project.xml @@ -73,8 +73,8 @@ - 0-1 - 1.19 + 2 + 1.20 diff --git a/php.editor/nbproject/project.properties b/php.editor/nbproject/project.properties --- a/php.editor/nbproject/project.properties +++ b/php.editor/nbproject/project.properties @@ -1,7 +1,7 @@ javac.source=1.6 javac.compilerargs=-Xlint -Xlint:-serial nbm.needs.restart=true -spec.version.base=1.10.0 +spec.version.base=1.11.0 test-unit-sys-prop.xtest.js.home=${netbeans.dest.dir}/gsf1 release.external/phpdocdesc.zip=docs/phpdocdesc.zip release.external/predefined_vars.zip=docs/predefined_vars.zip diff --git a/php.editor/nbproject/project.xml b/php.editor/nbproject/project.xml --- a/php.editor/nbproject/project.xml +++ b/php.editor/nbproject/project.xml @@ -55,8 +55,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/php.editor/src/org/netbeans/modules/php/editor/verification/AddUseImportRule.java b/php.editor/src/org/netbeans/modules/php/editor/verification/AddUseImportRule.java --- a/php.editor/src/org/netbeans/modules/php/editor/verification/AddUseImportRule.java +++ b/php.editor/src/org/netbeans/modules/php/editor/verification/AddUseImportRule.java @@ -49,7 +49,7 @@ import org.netbeans.modules.csl.api.Hint; import org.netbeans.modules.csl.api.HintFix; import org.netbeans.modules.csl.api.OffsetRange; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind; import org.netbeans.modules.php.editor.index.IndexedClass; import org.netbeans.modules.php.editor.index.IndexedConstant; diff --git a/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceHint.java b/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceHint.java --- a/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceHint.java +++ b/php.editor/src/org/netbeans/modules/php/editor/verification/IntroduceHint.java @@ -52,7 +52,7 @@ import org.netbeans.modules.csl.api.Hint; import org.netbeans.modules.csl.api.HintFix; import org.netbeans.modules.csl.api.OffsetRange; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.GsfUtilities; import org.netbeans.modules.parsing.spi.indexing.support.QuerySupport.Kind; import org.netbeans.modules.php.editor.CodeUtils; diff --git a/php.project/manifest.mf b/php.project/manifest.mf --- a/php.project/manifest.mf +++ b/php.project/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 2.23 +OpenIDE-Module-Specification-Version: 2.24 OpenIDE-Module: org.netbeans.modules.php.project OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties diff --git a/php.project/nbproject/project.xml b/php.project/nbproject/project.xml --- a/php.project/nbproject/project.xml +++ b/php.project/nbproject/project.xml @@ -96,8 +96,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/php.refactoring/manifest.mf b/php.refactoring/manifest.mf --- a/php.refactoring/manifest.mf +++ b/php.refactoring/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module: org.netbeans.modules.php.refactoring OpenIDE-Module-Layer: org/netbeans/modules/refactoring/php/resources/mf-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/php/Bundle.properties -OpenIDE-Module-Specification-Version: 1.8 +OpenIDE-Module-Specification-Version: 1.9 diff --git a/php.refactoring/nbproject/project.xml b/php.refactoring/nbproject/project.xml --- a/php.refactoring/nbproject/project.xml +++ b/php.refactoring/nbproject/project.xml @@ -28,8 +28,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupport.java b/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupport.java --- a/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupport.java +++ b/php.refactoring/src/org/netbeans/modules/refactoring/php/findusages/WhereUsedSupport.java @@ -51,7 +51,7 @@ import org.netbeans.modules.csl.api.ElementKind; import org.netbeans.modules.csl.api.Modifier; import org.netbeans.modules.csl.api.OffsetRange; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.parsing.api.ParserManager; import org.netbeans.modules.parsing.api.ResultIterator; diff --git a/php.refactoring/src/org/netbeans/modules/refactoring/php/ui/tree/FolderTreeElement.java b/php.refactoring/src/org/netbeans/modules/refactoring/php/ui/tree/FolderTreeElement.java --- a/php.refactoring/src/org/netbeans/modules/refactoring/php/ui/tree/FolderTreeElement.java +++ b/php.refactoring/src/org/netbeans/modules/refactoring/php/ui/tree/FolderTreeElement.java @@ -49,7 +49,7 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.modules.csl.api.ElementKind; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.php.project.api.PhpSourcePath; import org.netbeans.modules.refactoring.spi.ui.*; import org.openide.filesystems.FileObject; diff --git a/php.symfony/manifest.mf b/php.symfony/manifest.mf --- a/php.symfony/manifest.mf +++ b/php.symfony/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.php.symfony OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.5 +OpenIDE-Module-Specification-Version: 1.6 diff --git a/php.symfony/nbproject/project.xml b/php.symfony/nbproject/project.xml --- a/php.symfony/nbproject/project.xml +++ b/php.symfony/nbproject/project.xml @@ -19,8 +19,8 @@ - 1 - 1.11 + 2 + 1.20 diff --git a/php.symfony/src/org/netbeans/modules/php/symfony/ui/actions/GoToActionOrViewAction.java b/php.symfony/src/org/netbeans/modules/php/symfony/ui/actions/GoToActionOrViewAction.java --- a/php.symfony/src/org/netbeans/modules/php/symfony/ui/actions/GoToActionOrViewAction.java +++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/actions/GoToActionOrViewAction.java @@ -48,7 +48,7 @@ import javax.swing.Action; import javax.swing.JEditorPane; import javax.swing.text.TextAction; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.editor.NbEditorUtilities; import org.netbeans.modules.php.api.editor.EditorSupport; import org.netbeans.modules.php.api.editor.PhpClass; diff --git a/php.zend/manifest.mf b/php.zend/manifest.mf --- a/php.zend/manifest.mf +++ b/php.zend/manifest.mf @@ -2,5 +2,5 @@ OpenIDE-Module: org.netbeans.modules.php.zend OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.0 +OpenIDE-Module-Specification-Version: 1.1 diff --git a/php.zend/nbproject/project.xml b/php.zend/nbproject/project.xml --- a/php.zend/nbproject/project.xml +++ b/php.zend/nbproject/project.xml @@ -19,8 +19,8 @@ - 1 - 1.16 + 2 + 1.20 diff --git a/php.zend/src/org/netbeans/modules/php/zend/ui/actions/GoToActionOrViewAction.java b/php.zend/src/org/netbeans/modules/php/zend/ui/actions/GoToActionOrViewAction.java --- a/php.zend/src/org/netbeans/modules/php/zend/ui/actions/GoToActionOrViewAction.java +++ b/php.zend/src/org/netbeans/modules/php/zend/ui/actions/GoToActionOrViewAction.java @@ -46,7 +46,7 @@ import javax.swing.Action; import javax.swing.JEditorPane; import javax.swing.text.TextAction; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.editor.NbEditorUtilities; import org.netbeans.modules.php.api.editor.EditorSupport; import org.netbeans.modules.php.api.editor.PhpClass; diff --git a/ruby.extrahints/manifest.mf b/ruby.extrahints/manifest.mf --- a/ruby.extrahints/manifest.mf +++ b/ruby.extrahints/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module: org.netbeans.modules.ruby.extrahints/1 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/extrahints/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/ruby/extrahints/layer.xml -OpenIDE-Module-Specification-Version: 0.47 +OpenIDE-Module-Specification-Version: 0.48 diff --git a/ruby.extrahints/nbproject/project.xml b/ruby.extrahints/nbproject/project.xml --- a/ruby.extrahints/nbproject/project.xml +++ b/ruby.extrahints/nbproject/project.xml @@ -37,8 +37,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.hints/manifest.mf b/ruby.hints/manifest.mf --- a/ruby.hints/manifest.mf +++ b/ruby.hints/manifest.mf @@ -1,6 +1,6 @@ Manifest-Version: 1.0 OpenIDE-Module: org.netbeans.modules.ruby.hints/1 -OpenIDE-Module-Specification-Version: 0.44 +OpenIDE-Module-Specification-Version: 0.45 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/hints/Bundle.properties OpenIDE-Module-Layer: org/netbeans/modules/ruby/hints/layer.xml AutoUpdate-Show-In-Client: false diff --git a/ruby.hints/nbproject/project.xml b/ruby.hints/nbproject/project.xml --- a/ruby.hints/nbproject/project.xml +++ b/ruby.hints/nbproject/project.xml @@ -46,8 +46,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.hints/test/unit/src/org/netbeans/modules/ruby/hints/HintTestBase.java b/ruby.hints/test/unit/src/org/netbeans/modules/ruby/hints/HintTestBase.java --- a/ruby.hints/test/unit/src/org/netbeans/modules/ruby/hints/HintTestBase.java +++ b/ruby.hints/test/unit/src/org/netbeans/modules/ruby/hints/HintTestBase.java @@ -43,8 +43,6 @@ import org.netbeans.modules.csl.api.HintSeverity; import org.netbeans.modules.csl.api.HintsProvider; import org.netbeans.modules.csl.api.Rule; -import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.csl.hints.infrastructure.GsfHintsManager; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.ruby.AstUtilities; @@ -166,25 +164,4 @@ assertTrue(fails.toString(), fails.size() == 0); } - @SuppressWarnings("unchecked") - public void ensureRegistered(RubyAstRule hint) throws Exception { - Language language = LanguageRegistry.getInstance().getLanguageByMimeType(RubyInstallation.RUBY_MIME_TYPE); - assertNotNull(language.getHintsProvider()); - GsfHintsManager hintsManager = language.getHintsManager(); - Map> hints = (Map)hintsManager.getHints(); - Set kinds = hint.getKinds(); - for (NodeType nodeType : kinds) { - List rules = hints.get(nodeType); - assertNotNull(rules); - boolean found = false; - for (RubyAstRule rule : rules) { - if (rule.getClass() == hint.getClass()) { - found = true; - break; - } - } - - assertTrue(found); - } - } } diff --git a/ruby.merbproject/manifest.mf b/ruby.merbproject/manifest.mf --- a/ruby.merbproject/manifest.mf +++ b/ruby.merbproject/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module-Layer: org/netbeans/modules/ruby/merbproject/ui/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/merbproject/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.1 +OpenIDE-Module-Specification-Version: 1.2 AutoUpdate-Show-In-Client: false diff --git a/ruby.merbproject/nbproject/project.xml b/ruby.merbproject/nbproject/project.xml --- a/ruby.merbproject/nbproject/project.xml +++ b/ruby.merbproject/nbproject/project.xml @@ -37,8 +37,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.platform/manifest.mf b/ruby.platform/manifest.mf --- a/ruby.platform/manifest.mf +++ b/ruby.platform/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module-Layer: org/netbeans/modules/ruby/platform/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/platform/Bundle.properties AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 1.21 +OpenIDE-Module-Specification-Version: 1.22 diff --git a/ruby.platform/nbproject/project.xml b/ruby.platform/nbproject/project.xml --- a/ruby.platform/nbproject/project.xml +++ b/ruby.platform/nbproject/project.xml @@ -78,8 +78,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.project/manifest.mf b/ruby.project/manifest.mf --- a/ruby.project/manifest.mf +++ b/ruby.project/manifest.mf @@ -4,5 +4,5 @@ OpenIDE-Module-Install: org/netbeans/modules/ruby/rubyproject/RubyProjectModuleInstaller.class OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/rubyproject/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.17 +OpenIDE-Module-Specification-Version: 1.18 AutoUpdate-Show-In-Client: false diff --git a/ruby.project/nbproject/project.xml b/ruby.project/nbproject/project.xml --- a/ruby.project/nbproject/project.xml +++ b/ruby.project/nbproject/project.xml @@ -55,8 +55,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.railsprojects/manifest.mf b/ruby.railsprojects/manifest.mf --- a/ruby.railsprojects/manifest.mf +++ b/ruby.railsprojects/manifest.mf @@ -3,5 +3,5 @@ OpenIDE-Module-Layer: org/netbeans/modules/ruby/railsprojects/ui/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/railsprojects/Bundle.properties OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker -OpenIDE-Module-Specification-Version: 1.7 +OpenIDE-Module-Specification-Version: 1.8 AutoUpdate-Show-In-Client: false diff --git a/ruby.railsprojects/nbproject/project.xml b/ruby.railsprojects/nbproject/project.xml --- a/ruby.railsprojects/nbproject/project.xml +++ b/ruby.railsprojects/nbproject/project.xml @@ -46,8 +46,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.refactoring/manifest.mf b/ruby.refactoring/manifest.mf --- a/ruby.refactoring/manifest.mf +++ b/ruby.refactoring/manifest.mf @@ -3,4 +3,4 @@ OpenIDE-Module-Layer: org/netbeans/modules/refactoring/ruby/resources/mf-layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/refactoring/ruby/resources/Bundle.properties AutoUpdate-Show-In-Client: false -OpenIDE-Module-Specification-Version: 0.68 +OpenIDE-Module-Specification-Version: 0.69 diff --git a/ruby.refactoring/nbproject/project.xml b/ruby.refactoring/nbproject/project.xml --- a/ruby.refactoring/nbproject/project.xml +++ b/ruby.refactoring/nbproject/project.xml @@ -28,8 +28,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/WhereUsedElement.java b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/WhereUsedElement.java --- a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/WhereUsedElement.java +++ b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/WhereUsedElement.java @@ -48,7 +48,7 @@ import org.netbeans.editor.Utilities; import org.netbeans.modules.csl.api.Modifier; import org.netbeans.modules.csl.api.OffsetRange; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.GsfUtilities; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.refactoring.ruby.ui.tree.ElementGripFactory; diff --git a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/RubyWhereUsedQueryPlugin.java b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/RubyWhereUsedQueryPlugin.java --- a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/RubyWhereUsedQueryPlugin.java +++ b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/plugins/RubyWhereUsedQueryPlugin.java @@ -69,7 +69,7 @@ import org.netbeans.modules.csl.api.Modifier; import org.netbeans.modules.csl.api.OffsetRange; import org.netbeans.modules.csl.api.Severity; -import org.netbeans.modules.csl.core.UiUtils; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.csl.spi.ParserResult; import org.netbeans.modules.csl.spi.support.ModificationResult; import org.netbeans.modules.refactoring.api.Problem; diff --git a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/ui/tree/FolderTreeElement.java b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/ui/tree/FolderTreeElement.java --- a/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/ui/tree/FolderTreeElement.java +++ b/ruby.refactoring/src/org/netbeans/modules/refactoring/ruby/ui/tree/FolderTreeElement.java @@ -48,8 +48,8 @@ import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; import org.netbeans.modules.csl.api.ElementKind; -import org.netbeans.modules.csl.core.UiUtils; import org.netbeans.api.java.classpath.ClassPath; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.modules.refactoring.spi.ui.*; import org.netbeans.modules.refactoring.spi.ui.TreeElementFactory; import org.netbeans.modules.ruby.rubyproject.RubyProject; diff --git a/ruby.rhtml/nbproject/project.properties b/ruby.rhtml/nbproject/project.properties --- a/ruby.rhtml/nbproject/project.properties +++ b/ruby.rhtml/nbproject/project.properties @@ -39,7 +39,7 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.6 -spec.version.base=0.71.0 +spec.version.base=0.72.0 test-unit-sys-prop.xtest.jruby.home=${netbeans.dest.dir}/ruby2/jruby-1.2.0 diff --git a/ruby.rhtml/nbproject/project.xml b/ruby.rhtml/nbproject/project.xml --- a/ruby.rhtml/nbproject/project.xml +++ b/ruby.rhtml/nbproject/project.xml @@ -19,8 +19,8 @@ - 1 - 1.19 + 2 + 1.20 @@ -256,6 +256,10 @@ + org.netbeans.libs.junit4 + + + org.netbeans.modules.csl.api @@ -316,6 +320,11 @@ + org.netbeans.modules.nbjunit + + + + org.netbeans.modules.progress.ui diff --git a/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/editor/RhtmlKit.java b/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/editor/RhtmlKit.java --- a/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/editor/RhtmlKit.java +++ b/ruby.rhtml/src/org/netbeans/modules/ruby/rhtml/editor/RhtmlKit.java @@ -60,14 +60,14 @@ import org.netbeans.editor.ext.html.dtd.Registry; import org.netbeans.lib.editor.util.CharSequenceUtilities; import org.netbeans.lib.editor.util.swing.DocumentUtilities; -import org.netbeans.modules.csl.core.DeleteToNextCamelCasePosition; -import org.netbeans.modules.csl.core.DeleteToPreviousCamelCasePosition; -import org.netbeans.modules.csl.core.NextCamelCasePosition; -import org.netbeans.modules.csl.core.PreviousCamelCasePosition; -import org.netbeans.modules.csl.core.SelectCodeElementAction; -import org.netbeans.modules.csl.core.SelectNextCamelCasePosition; -import org.netbeans.modules.csl.core.SelectPreviousCamelCasePosition; -import org.netbeans.modules.csl.editor.InstantRenameAction; +import org.netbeans.modules.csl.api.DeleteToNextCamelCasePosition; +import org.netbeans.modules.csl.api.DeleteToPreviousCamelCasePosition; +import org.netbeans.modules.csl.api.InstantRenameAction; +import org.netbeans.modules.csl.api.NextCamelCasePosition; +import org.netbeans.modules.csl.api.PreviousCamelCasePosition; +import org.netbeans.modules.csl.api.SelectCodeElementAction; +import org.netbeans.modules.csl.api.SelectNextCamelCasePosition; +import org.netbeans.modules.csl.api.SelectPreviousCamelCasePosition; import org.netbeans.modules.html.editor.api.HtmlKit; import org.netbeans.modules.html.editor.api.gsf.HtmlParserResult; import org.netbeans.modules.ruby.lexer.RubyTokenId; @@ -489,7 +489,7 @@ } final BaseDocument doc = (BaseDocument)target.getDocument(); doc.runAtomic(new Runnable() { - public void run() { + public @Override void run() { try { Caret caret = target.getCaret(); int startPos; diff --git a/ruby.rhtml/test/unit/src/org/netbeans/modules/ruby/rhtml/RhtmlTestBase.java b/ruby.rhtml/test/unit/src/org/netbeans/modules/ruby/rhtml/RhtmlTestBase.java --- a/ruby.rhtml/test/unit/src/org/netbeans/modules/ruby/rhtml/RhtmlTestBase.java +++ b/ruby.rhtml/test/unit/src/org/netbeans/modules/ruby/rhtml/RhtmlTestBase.java @@ -29,9 +29,6 @@ package org.netbeans.modules.ruby.rhtml; import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import javax.swing.Action; import javax.swing.JEditorPane; import org.netbeans.api.editor.mimelookup.MimePath; @@ -42,19 +39,13 @@ import org.netbeans.editor.Formatter; import org.netbeans.editor.ext.ExtFormatter; import org.netbeans.lib.lexer.test.TestLanguageProvider; -import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.LanguageRegistry; import org.netbeans.modules.html.editor.indent.HtmlIndentTaskFactory; import org.netbeans.modules.ruby.RubyTestBase; import org.netbeans.modules.ruby.rhtml.editor.RhtmlKit; import org.netbeans.modules.ruby.rhtml.lexer.api.RhtmlTokenId; import org.openide.filesystems.FileObject; -import org.netbeans.modules.csl.editor.codetemplates.CslCorePackageAccessor; import org.netbeans.modules.csl.spi.DefaultLanguageConfig; -import org.netbeans.modules.ruby.RubyKeystrokeHandler; -import org.netbeans.modules.ruby.RubyRenameHandler; import org.netbeans.modules.ruby.lexer.RubyTokenId; -import org.openide.filesystems.FileUtil; /** * @@ -99,23 +90,6 @@ Formatter.setFormatter(RhtmlKit.class, new ExtFormatter(RhtmlKit.class)); - LanguageRegistry registry = LanguageRegistry.getInstance(); - List actions = Collections.emptyList(); - if (!LanguageRegistry.getInstance().isSupported(RhtmlTokenId.MIME_TYPE)) { - Language dl = new Language("org/netbeans/modules/ruby/jrubydoc.png", RhtmlTokenId.MIME_TYPE, - actions, new RhtmlLanguage(), - new RhtmlCompleter(), new RubyRenameHandler(), new RhtmlFinder(), - null, new RubyKeystrokeHandler(), null, null, null, true); - List languages = new ArrayList(); - languages.add(dl); - CslCorePackageAccessor.get().languageRegistryAddLanguages(languages); - - String mimeFolder = "Editors/" + dl.getMimeType(); - final FileObject root = FileUtil.getConfigFile(mimeFolder); // NOI18N - if (root == null) { - FileUtil.createFolder(FileUtil.getConfigRoot(), mimeFolder); - } - } } @Override diff --git a/ruby.testrunner/manifest.mf b/ruby.testrunner/manifest.mf --- a/ruby.testrunner/manifest.mf +++ b/ruby.testrunner/manifest.mf @@ -2,5 +2,5 @@ AutoUpdate-Show-In-Client: false OpenIDE-Module: org.netbeans.modules.ruby.testrunner OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/testrunner/Bundle.properties -OpenIDE-Module-Specification-Version: 1.6 +OpenIDE-Module-Specification-Version: 1.7 diff --git a/ruby.testrunner/nbproject/project.xml b/ruby.testrunner/nbproject/project.xml --- a/ruby.testrunner/nbproject/project.xml +++ b/ruby.testrunner/nbproject/project.xml @@ -26,8 +26,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/ruby/manifest.mf b/ruby/manifest.mf --- a/ruby/manifest.mf +++ b/ruby/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.ruby/1 OpenIDE-Module-Layer: org/netbeans/modules/ruby/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/ruby/Bundle.properties -OpenIDE-Module-Specification-Version: 1.17 +OpenIDE-Module-Specification-Version: 1.18 AutoUpdate-Show-In-Client: false diff --git a/ruby/nbproject/project.xml b/ruby/nbproject/project.xml --- a/ruby/nbproject/project.xml +++ b/ruby/nbproject/project.xml @@ -55,8 +55,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/web.core.syntax/nbproject/project.properties b/web.core.syntax/nbproject/project.properties --- a/web.core.syntax/nbproject/project.properties +++ b/web.core.syntax/nbproject/project.properties @@ -47,7 +47,7 @@ javac.source=1.6 javadoc.arch=${basedir}/arch.xml -spec.version.base=2.9.0 +spec.version.base=2.10.0 test.config.validation.includes=\ **/AutoCompletionTest.class,**/CompletionTest.class diff --git a/web.core.syntax/nbproject/project.xml b/web.core.syntax/nbproject/project.xml --- a/web.core.syntax/nbproject/project.xml +++ b/web.core.syntax/nbproject/project.xml @@ -86,8 +86,8 @@ - 1 - 1.19 + 2 + 1.20 diff --git a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java --- a/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java +++ b/web.core.syntax/src/org/netbeans/modules/web/core/syntax/JspKit.java @@ -42,15 +42,9 @@ package org.netbeans.modules.web.core.syntax; -import java.util.List; import java.util.Map; import org.netbeans.editor.ext.ExtKit; import org.netbeans.modules.csl.api.KeystrokeHandler; -import org.netbeans.modules.csl.core.Language; -import org.netbeans.modules.csl.core.LanguageRegistry; -import org.netbeans.modules.csl.core.SelectCodeElementAction; -import org.netbeans.modules.csl.editor.InstantRenameAction; -import org.netbeans.modules.csl.editor.ToggleBlockCommentAction; import org.netbeans.modules.editor.NbEditorDocument; import org.netbeans.modules.editor.NbEditorKit; import org.netbeans.modules.web.core.syntax.deprecated.Jsp11Syntax; @@ -81,6 +75,10 @@ import org.netbeans.editor.BaseKit.InsertBreakAction; import org.netbeans.editor.ext.ExtKit.ExtDefaultKeyTypedAction; import org.netbeans.editor.ext.ExtKit.ExtDeleteCharAction; +import org.netbeans.modules.csl.api.InstantRenameAction; +import org.netbeans.modules.csl.api.SelectCodeElementAction; +import org.netbeans.modules.csl.api.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.UiUtils; import org.netbeans.spi.lexer.MutableTextInput; /** @@ -333,18 +331,6 @@ return new org.openide.util.HelpCtx(JspKit.class); } - static KeystrokeHandler getBracketCompletion(Document doc, int offset) { - BaseDocument baseDoc = (BaseDocument) doc; - List list = LanguageRegistry.getInstance().getEmbeddedLanguages(baseDoc, offset); - for (Language l : list) { - if (l.getBracketCompletion() != null) { - return l.getBracketCompletion(); - } - } - - return null; - } - /** * Returns true if bracket completion is enabled in options. */ @@ -384,7 +370,7 @@ @Override protected Object beforeBreak(JTextComponent target, BaseDocument doc, Caret caret) { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, caret.getDot()); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, caret.getDot()); if (bracketCompletion != null) { try { @@ -468,7 +454,7 @@ Caret caret, String str, boolean overwrite) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { // TODO - check if we're in a comment etc. and if so, do nothing @@ -499,7 +485,7 @@ BaseDocument doc = (BaseDocument) document; if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { try { @@ -580,7 +566,7 @@ @Override protected void charBackspaced(BaseDocument doc, int dotPos, Caret caret, char ch) throws BadLocationException { if (completionSettingEnabled()) { - KeystrokeHandler bracketCompletion = getBracketCompletion(doc, dotPos); + KeystrokeHandler bracketCompletion = UiUtils.getBracketCompletion(doc, dotPos); if (bracketCompletion != null) { bracketCompletion.charBackspaced(doc, dotPos, currentTarget, ch); diff --git a/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java b/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java --- a/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java +++ b/web.core.syntax/test/unit/src/org/netbeans/modules/web/core/syntax/formatting/JspIndenterTest.java @@ -61,7 +61,6 @@ import org.netbeans.modules.csl.api.DataLoadersBridge; import org.netbeans.modules.csl.api.Formatter; import org.netbeans.modules.csl.api.test.CslTestBase.IndentPrefs; -import org.netbeans.modules.csl.core.GsfIndentTaskFactory; import org.netbeans.modules.css.editor.indent.CssIndentTaskFactory; import org.netbeans.modules.css.formatting.api.support.AbstractIndenter; import org.netbeans.modules.css.lexer.api.CssTokenId; @@ -143,7 +142,6 @@ MockMimeLookup.setInstances(MimePath.parse("text/x-java"), factory, new JavacParserFactory(), new ClassParserFactory()); ExpressionLanguageIndentTaskFactory elReformatFactory = new ExpressionLanguageIndentTaskFactory(); MockMimeLookup.setInstances(MimePath.parse("text/x-el"), elReformatFactory); - GsfIndentTaskFactory jsFactory = new GsfIndentTaskFactory(); // adding javascript formatter makes some tests randomly fail; // for now I'm disabling //MockMimeLookup.setInstances(MimePath.parse("text/javascript"), jsFactory, new GsfParserFactory()); diff --git a/web.jsf.editor/manifest.mf b/web.jsf.editor/manifest.mf --- a/web.jsf.editor/manifest.mf +++ b/web.jsf.editor/manifest.mf @@ -2,6 +2,6 @@ OpenIDE-Module: org.netbeans.modules.web.jsf.editor OpenIDE-Module-Layer: org/netbeans/modules/web/jsf/editor/resources/layer.xml OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/web/jsf/editor/resources/Bundle.properties -OpenIDE-Module-Specification-Version: 1.5 +OpenIDE-Module-Specification-Version: 1.6 AutoUpdate-Show-In-Client: false diff --git a/web.jsf.editor/nbproject/project.xml b/web.jsf.editor/nbproject/project.xml --- a/web.jsf.editor/nbproject/project.xml +++ b/web.jsf.editor/nbproject/project.xml @@ -77,8 +77,8 @@ - 1 - 1.11 + 2 + 1.20 diff --git a/web.jsf/nbproject/project.properties b/web.jsf/nbproject/project.properties --- a/web.jsf/nbproject/project.properties +++ b/web.jsf/nbproject/project.properties @@ -38,7 +38,7 @@ # made subject to such option by the copyright holder. javac.source=1.6 -spec.version.base=1.17.0 +spec.version.base=1.18.0 test.qa-functional.cp.extra=\ diff --git a/web.jsf/nbproject/project.xml b/web.jsf/nbproject/project.xml --- a/web.jsf/nbproject/project.xml +++ b/web.jsf/nbproject/project.xml @@ -129,8 +129,8 @@ - 1 - 1.11 + 2 + 1.20 diff --git a/xml.text/nbproject/project.properties b/xml.text/nbproject/project.properties --- a/xml.text/nbproject/project.properties +++ b/xml.text/nbproject/project.properties @@ -38,7 +38,7 @@ # made subject to such option by the copyright holder. javac.source=1.6 -spec.version.base=1.22.0 +spec.version.base=1.23.0 test.unit.cp.extra=${openide.dir}/core/openide.jar:${openide.loaders.dir}/core/openide-loaders.jar test.unit.run.cp.extra=${test.unit.cp.extra} diff --git a/xml.text/nbproject/project.xml b/xml.text/nbproject/project.xml --- a/xml.text/nbproject/project.xml +++ b/xml.text/nbproject/project.xml @@ -69,8 +69,8 @@ - 1 - 1.8 + 2 + 1.20 diff --git a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java b/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java --- a/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java +++ b/xml.text/src/org/netbeans/modules/xml/text/syntax/XMLKit.java @@ -57,7 +57,7 @@ // we depend on NetBeans editor stuff import org.netbeans.editor.*; -import org.netbeans.modules.csl.editor.ToggleBlockCommentAction; +import org.netbeans.modules.csl.api.ToggleBlockCommentAction; import org.netbeans.modules.editor.*; import org.netbeans.modules.xml.text.XmlCommentHandler;