- remove deprecated internal friend api code

- bump major spec version of versioning.util and mercurial
apache · Mar 30, 2024 · a9e073d · a9e073d
1 parent 0d9f149
commit a9e073d
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 827 deletions.
diff --git a/...s/bugtracking/team/DummyRepositories.java → ...ugtracking/dummies/DummyRepositories.java b/...s/bugtracking/team/DummyRepositories.java → ...ugtracking/dummies/DummyRepositories.java
@@ -17,11 +17,12 @@
  * under the License.
  */
 
-package org.netbeans.modules.bugtracking.team;
+package org.netbeans.modules.bugtracking.dummies;
 
 import java.util.Collection;
 import java.util.Collections;
 import org.netbeans.modules.bugtracking.RepositoryImpl;
+import org.netbeans.modules.bugtracking.team.TeamRepositories;
 
 /**
  * Dummy implementation that returns an empty array of repositories.

diff --git a/...t/unit/src/org/netbeans/modules/bugtracking/ui/repository/RepositoryComboSupportTest.java b/...t/unit/src/org/netbeans/modules/bugtracking/ui/repository/RepositoryComboSupportTest.java
@@ -33,7 +33,7 @@
 import org.junit.Test;
 import org.netbeans.modules.bugtracking.dummies.DummyBugtrackingConnector;
 import org.netbeans.modules.bugtracking.dummies.DummyBugtrackingOwnerSupport;
-import org.netbeans.modules.bugtracking.team.DummyRepositories;
+import org.netbeans.modules.bugtracking.dummies.DummyRepositories;
 import org.netbeans.modules.bugtracking.dummies.DummyNode;
 import org.netbeans.modules.bugtracking.dummies.DummyTopComponentRegistry;
 import org.netbeans.modules.bugtracking.dummies.DummyWindowManager;
@@ -69,7 +69,8 @@ public class RepositoryComboSupportTest {
 
     @BeforeClass
     public static void setLookup() {
-        MockLookup.setLayersAndInstances(new DummyRepositories(), 
+        MockLookup.setLayersAndInstances(
+            new DummyRepositories(), 
             new DummyWindowManager(), 
             new DummyBugtrackingOwnerSupport(),
             new DummyProjectServices(),

diff --git a/ide/git/src/org/netbeans/modules/git/Annotator.java b/ide/git/src/org/netbeans/modules/git/Annotator.java
@@ -229,7 +229,6 @@ public Image annotateIcon(Image icon, VCSContext context) {
         for (File file : context.getRootFiles()) {
             if (file.isDirectory()) {
                 folderAnnotation = true;
-                Utils.addFolderToLog(file);
                 break;
             }
         }

diff --git a/ide/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java b/ide/git/src/org/netbeans/modules/git/ui/blame/TooltipWindow.java
@@ -60,7 +60,6 @@
 import org.netbeans.modules.git.Git;
 import org.netbeans.modules.git.ui.history.SearchHistoryAction;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport;
-import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.AuthorLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.IssueLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.StyledDocumentHyperlink;
 import org.netbeans.modules.versioning.util.VCSHyperlinkProvider;
@@ -264,15 +263,9 @@ public TooltipContentPanel(JTextComponent parentPane) {
                 }
 
                 // author
-                {
-                    String author = annotateLine.getAuthor().toString();
-                    StyledDocumentHyperlink l = linkerSupport.getLinker(AuthorLinker.class, 0);
-                    if (l != null) {
-                        l.insertString(doc, authorStyle);
-                    } else {
-                        doc.insertString(doc.getLength(), author, normalStyle);
-                    }
-                }
+                String author = annotateLine.getAuthor().toString();
+                doc.insertString(doc.getLength(), author, normalStyle);
+
                 // date
                 doc.insertString(doc.getLength(), " ", normalStyle);
                 doc.insertString(doc.getLength(), DateFormat.getDateInstance().format(new Date(annotateLine.getRevisionInfo().getCommitTime())), normalStyle);

diff --git a/ide/git/src/org/netbeans/modules/git/ui/history/SummaryView.java b/ide/git/src/org/netbeans/modules/git/ui/history/SummaryView.java
@@ -294,11 +294,6 @@ public SummaryView(SearchHistoryPanel master, List<? extends LogEntry> results)
         this.master = master;
     }
 
-    @Deprecated(forRemoval = true)
-    public SummaryView(SearchHistoryPanel master, List<? extends LogEntry> results, Map<String, org.netbeans.modules.versioning.util.VCSKenaiAccessor.KenaiUser> kenaiUserMap) {
-        this(master, results);
-    }
-
     private static SummaryViewMaster createViewSummaryMaster (final SearchHistoryPanel master) {
         final Map<String, String> colors = Map.of(
             "A", GitUtils.getColorString(AnnotationColorProvider.getInstance().ADDED_FILE.getActualColor()),

diff --git a/ide/mercurial/nbproject/org-netbeans-modules-mercurial.sig b/ide/mercurial/nbproject/org-netbeans-modules-mercurial.sig
@@ -1,5 +1,5 @@
 #Signature file v4.1
-#Version 1.65.0
+#Version 1.66.0
 
 CLSS public java.lang.Object
 cons public init()
@@ -22,11 +22,7 @@ meth public static boolean isClientAvailable(boolean)
 meth public static boolean isRepository(java.lang.String)
 meth public static java.io.File openCloneWizard(java.lang.String,boolean) throws java.net.MalformedURLException
 meth public static void addRecentUrl(java.lang.String) throws java.net.MalformedURLException
-meth public static void cloneRepository(java.lang.String,java.io.File,java.lang.String,java.lang.String,java.lang.String) throws java.net.MalformedURLException
- anno 0 java.lang.Deprecated()
 meth public static void cloneRepository(java.lang.String,java.io.File,java.lang.String,java.lang.String,java.lang.String,boolean) throws java.net.MalformedURLException
-meth public static void cloneRepository(java.lang.String,java.io.File,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String) throws java.net.MalformedURLException
- anno 0 java.lang.Deprecated()
 meth public static void cloneRepository(java.lang.String,java.io.File,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,boolean) throws java.net.MalformedURLException
 meth public static void commit(java.io.File[],java.lang.String)
 meth public static void openCloneWizard(java.lang.String) throws java.net.MalformedURLException

diff --git a/ide/mercurial/nbproject/project.properties b/ide/mercurial/nbproject/project.properties
@@ -19,7 +19,7 @@ javac.source=1.8
 nbm.homepage=http://wiki.netbeans.org/wiki/view/MercurialVersionControl
 nbm.module.author=John Rice and Padraig O'Briain
 nbm.needs.restart=true
-spec.version.base=1.66.0
+spec.version.base=2.0.0
 
 #qa-functional
 test.qa-functional.cp.extra=${openide.nodes.dir}/modules/org-openide-nodes.jar:\${openide.util.dir}/lib/org-openide-util.jar:${openide.util.ui.dir}/lib/org-openide-util-ui.jar

diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java b/ide/mercurial/src/org/netbeans/modules/mercurial/MercurialAnnotator.java
@@ -174,7 +174,6 @@ public Image annotateIcon(Image icon, VCSContext context) {
         for (File file : context.getRootFiles()) {
             if (file.isDirectory()) {
                 folderAnnotation = true;
-                Utils.addFolderToLog(file);
                 break;
             }
         }

diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/api/Mercurial.java b/ide/mercurial/src/org/netbeans/modules/mercurial/api/Mercurial.java
@@ -61,38 +61,8 @@
 public class Mercurial {
 
     /**
-     * <p><strong>Depracated</strong>, use {@link #cloneRepository(String,File,String,String,String,boolean)} instead.</p>
      * Clones the given repository to the given directory. The method blocks
-     * until the whole chcekout is done. Do not call in AWT.
-     * After the clone a scan for netbeans projects will be started.
-     *
-     * @param  repositoryUrl  URL of the Mercurial repository to be cloned
-     * @param  targetDir  target where  cloned repository should be created
-     * @param  cloneName  name of the cloned repository
-     *                    (name of the root folder of the clone)
-     * @param  defaultPull  initial URL for pulling updates
-     * @param  defaultPush  initial URL for pushing updates
-     */
-    @Deprecated
-    public static void cloneRepository(String repositoryUrl,
-                                       File targetDir,
-                                       String cloneName,
-                                       String defaultPull,
-                                       String defaultPush) throws MalformedURLException {
-        assert !SwingUtilities.isEventDispatchThread() : "Accessing remote repository. Do not call in awt!";
-        cloneRepository(repositoryUrl,
-                        targetDir,
-                        cloneName,
-                        defaultPull,
-                        defaultPush,
-                        null,
-                        null,
-                        true);
-    }
-
-    /**
-     * Clones the given repository to the given directory. The method blocks
-     * until the whole chcekout is done. Do not call in AWT.
+     * until the whole checkout is done. Do not call in AWT.
      *
      * @param  repositoryUrl  URL of the Mercurial repository to be cloned
      * @param  targetDir  target where  cloned repository should be created
@@ -119,43 +89,9 @@ public static void cloneRepository(String repositoryUrl,
                         scanForProjects);
     }
 
-    /**
-     * <p><strong>Depracated</strong>, use {@link #cloneRepository(String,File,String,String,String,String,String,boolean)} instead.</p>
-     * Clones the given repository to the given directory. The method blocks
-     * until the whole chcekout is done. Do not call in AWT.
-     * After the clone a scan for netbeans projects will be started.
-     *
-     * @param  repositoryUrl  URL of the Mercurial repository to be cloned
-     * @param  targetDir  target where  cloned repository should be created
-     * @param  cloneName  name of the cloned repository
-     *                    (name of the root folder of the clone)
-     * @param  defaultPull  initial URL for pulling updates
-     * @param  defaultPush  initial URL for pushing updates
-     * @param  username  username for access to the given repository
-     * @param  password  password for access to the given repository
-     */
-    @Deprecated
-    public static void cloneRepository(String repositoryUrl,
-                                       File targetDir,
-                                       String cloneName,
-                                       String pullUrl,
-                                       String pushUrl,
-                                       String username,
-                                       String password)
-            throws MalformedURLException {
-        cloneRepository(repositoryUrl,
-                targetDir,
-                cloneName,
-                pullUrl,
-                pushUrl,
-                username,
-                password,
-                true);
-    }
-
     /**
      * Clones the given repository to the given directory. The method blocks
-     * until the whole chcekout is done. Do not call in AWT.
+     * until the whole checkout is done. Do not call in AWT.
      *
      * @param  repositoryUrl  URL of the Mercurial repository to be cloned
      * @param  targetDir  target where  cloned repository should be created

diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/TooltipWindow.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/annotate/TooltipWindow.java
@@ -59,7 +59,6 @@
 import org.netbeans.modules.mercurial.Mercurial;
 import org.netbeans.modules.mercurial.ui.log.LogAction;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport;
-import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.AuthorLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.IssueLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.StyledDocumentHyperlink;
 import org.netbeans.modules.versioning.util.VCSHyperlinkProvider;
@@ -254,15 +253,8 @@ public TooltipContentPanel(JTextComponent parentPane) {
                 }
 
                 // author
-                {
-                    String author = annotateLine.getAuthor();
-                    StyledDocumentHyperlink l = linkerSupport.getLinker(AuthorLinker.class, 0);
-                    if (l != null) {
-                        l.insertString(doc, authorStyle);
-                    } else {
-                        doc.insertString(doc.getLength(), author, normalStyle);
-                    }
-                }
+                String author = annotateLine.getAuthor();
+                doc.insertString(doc.getLength(), author, normalStyle);
 
                 // date
                 doc.insertString(doc.getLength(), " ", normalStyle);

diff --git a/ide/subversion/src/org/netbeans/modules/subversion/Annotator.java b/ide/subversion/src/org/netbeans/modules/subversion/Annotator.java
@@ -596,9 +596,6 @@ private Image annotateFolderIcon(VCSContext context, Image icon) {
             if (info == null) {
                 filesToRefresh.add(file);
             }
-            if (file.isDirectory()) {
-                Utils.addFolderToLog(file);
-            }
         }
         cache.refreshAsync(filesToRefresh);
 

diff --git a/ide/subversion/src/org/netbeans/modules/subversion/Subversion.java b/ide/subversion/src/org/netbeans/modules/subversion/Subversion.java
@@ -37,6 +37,7 @@
 import org.netbeans.api.queries.SharabilityQuery;
 import org.netbeans.modules.subversion.config.PasswordFile;
 import org.netbeans.modules.subversion.ui.repository.RepositoryConnection;
+import org.netbeans.modules.versioning.spi.VersioningSupport;
 import org.netbeans.modules.versioning.util.DelayScanRegistry;
 import org.netbeans.modules.versioning.util.VCSHyperlinkProvider;
 import org.openide.filesystems.FileUtil;
@@ -478,7 +479,9 @@ public File getTopmostManagedAncestor (File file) {
                 }
                 break;
             }
-            if (org.netbeans.modules.versioning.util.Utils.isScanForbidden(file)) break;
+            if (VersioningSupport.isExcluded(file)) {
+                break;
+            }
             // is the folder a special one where metadata should not be looked for?
             boolean forbiddenFolder = org.netbeans.modules.versioning.util.Utils.isForbiddenFolder(file);
             if (!forbiddenFolder && SvnUtils.hasMetadata(file)) {

diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/blame/TooltipWindow.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/blame/TooltipWindow.java
@@ -55,7 +55,6 @@
 import javax.swing.text.StyledDocument;
 import org.netbeans.modules.subversion.Subversion;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport;
-import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.AuthorLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.IssueLinker;
 import org.netbeans.modules.versioning.util.VCSHyperlinkSupport.StyledDocumentHyperlink;
 import org.netbeans.modules.versioning.util.VCSHyperlinkProvider;
@@ -240,15 +239,8 @@ public TooltipContentPanel(JTextComponent parentPane) {
                 doc.insertString(doc.getLength(), annotateLine.getRevision() + " - ", normalStyle);
 
                 // author
-                {
-                    String author = annotateLine.getAuthor();
-                    StyledDocumentHyperlink l = linkerSupport.getLinker(AuthorLinker.class, 0);
-                    if (l != null) {
-                        l.insertString(doc, authorStyle);
-                    } else {
-                        doc.insertString(doc.getLength(), author, normalStyle);
-                    }
-                }
+                String author = annotateLine.getAuthor();
+                doc.insertString(doc.getLength(), author, normalStyle);
 
                 // date
                 doc.insertString(doc.getLength(), " ", normalStyle);

diff --git a/ide/versioning.util/nbproject/project.properties b/ide/versioning.util/nbproject/project.properties
@@ -20,7 +20,7 @@ javac.source=11
 javac.target=11
 
 javadoc.name=Versioning Support Utilities
-spec.version.base=1.94.0
+spec.version.base=2.0.0
 is.autoload=true
 
 # Fatal error: Fatal error: class javax.net.SocketFactory not found

diff --git a/ide/versioning.util/src/org/netbeans/modules/proxy/Base64Encoder.java b/ide/versioning.util/src/org/netbeans/modules/proxy/Base64Encoder.java
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java b/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java
@@ -54,12 +54,6 @@ public abstract class AbstractSummaryView implements MouseListener, MouseMotionL
     private final VCSHyperlinkSupport linkerSupport = new VCSHyperlinkSupport();
     private static final int NEXT_FILES_INITIAL_PAGING = 50;
 
-    @SuppressWarnings("removal")
-    @Deprecated(forRemoval = true)
-    public AbstractSummaryView(SummaryViewMaster master, final List<? extends LogEntry> results, Map<String, org.netbeans.modules.versioning.util.VCSKenaiAccessor.KenaiUser> kenaiUsersMap) {
-        this(master, results);
-    }
-
     public AbstractSummaryView(SummaryViewMaster master, final List<? extends LogEntry> results) {
         this.master = master;
         list = WeakListeners.propertyChange(this, null);

diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/history/SummaryCellRenderer.java b/ide/versioning.util/src/org/netbeans/modules/versioning/history/SummaryCellRenderer.java
@@ -120,12 +120,6 @@ public SummaryCellRenderer(AbstractSummaryView summaryView, VCSHyperlinkSupport
         searchHiliteAttrs = ((FontColorSettings) MimeLookup.getLookup(MimePath.get("text/x-java")).lookup(FontColorSettings.class)).getFontColors("highlight-search"); //NOI18N
     }
 
-    @SuppressWarnings("removal")
-    @Deprecated(forRemoval = true)
-    public SummaryCellRenderer(AbstractSummaryView summaryView, final VCSHyperlinkSupport linkerSupport, Map<String, org.netbeans.modules.versioning.util.VCSKenaiAccessor.KenaiUser> kenaiUsersMap) {
-        this(summaryView, linkerSupport);
-    }
-
     private static Color darker (Color c) {
         return darker(c, DARKEN_FACTOR);
     }