Menu
▾
▴
[ jEdit-commits ] SF.net SVN: jedit:[25691] jEdit/trunk
|
From: <kp...@us...> - 2023-10-11 19:19:45
|
Revision: 25691
http://sourceforge.net/p/jedit/svn/25691
Author: kpouer
Date: 2023-10-11 19:19:41 +0000 (Wed, 11 Oct 2023)
Log Message:
-----------
removed jsr305 which is incompatible with Java module system
Modified Paths:
--------------
jEdit/trunk/README.SRC.txt
jEdit/trunk/build.xml
jEdit/trunk/ivy.xml
jEdit/trunk/org/gjt/sp/jedit/ActionSet.java
jEdit/trunk/org/gjt/sp/jedit/EditPane.java
jEdit/trunk/org/gjt/sp/jedit/EditPlugin.java
jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java
jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java
jEdit/trunk/org/gjt/sp/jedit/Registers.java
jEdit/trunk/org/gjt/sp/jedit/ServiceListHandler.java
jEdit/trunk/org/gjt/sp/jedit/View.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java
jEdit/trunk/org/gjt/sp/jedit/buffer/BufferSegment.java
jEdit/trunk/org/gjt/sp/jedit/buffer/JEditBuffer.java
jEdit/trunk/org/gjt/sp/jedit/buffer/PositionManager.java
jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java
jEdit/trunk/org/gjt/sp/jedit/gui/DefaultInputHandler.java
jEdit/trunk/org/gjt/sp/jedit/gui/DockingLayoutManager.java
jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java
jEdit/trunk/org/gjt/sp/jedit/gui/FilteredListModel.java
jEdit/trunk/org/gjt/sp/jedit/gui/LogViewer.java
jEdit/trunk/org/gjt/sp/jedit/gui/PanelWindowContainer.java
jEdit/trunk/org/gjt/sp/jedit/gui/PingPongList.java
jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java
jEdit/trunk/org/gjt/sp/jedit/input/AbstractInputHandler.java
jEdit/trunk/org/gjt/sp/jedit/io/AutoDetection.java
jEdit/trunk/org/gjt/sp/jedit/io/CharsetEncoding.java
jEdit/trunk/org/gjt/sp/jedit/io/CopyFileWorker.java
jEdit/trunk/org/gjt/sp/jedit/io/Encoding.java
jEdit/trunk/org/gjt/sp/jedit/io/EncodingWithBOM.java
jEdit/trunk/org/gjt/sp/jedit/io/FavoritesVFS.java
jEdit/trunk/org/gjt/sp/jedit/io/FileRootsVFS.java
jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java
jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java
jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java
jEdit/trunk/org/gjt/sp/jedit/jEdit.java
jEdit/trunk/org/gjt/sp/jedit/manager/BufferManagerImpl.java
jEdit/trunk/org/gjt/sp/jedit/manager/ViewManager.java
jEdit/trunk/org/gjt/sp/jedit/manager/ViewManagerImpl.java
jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java
jEdit/trunk/org/gjt/sp/jedit/msg/BufferUpdate.java
jEdit/trunk/org/gjt/sp/jedit/msg/DockableWindowUpdate.java
jEdit/trunk/org/gjt/sp/jedit/msg/EditPaneUpdate.java
jEdit/trunk/org/gjt/sp/jedit/msg/PluginUpdate.java
jEdit/trunk/org/gjt/sp/jedit/msg/VFSUpdate.java
jEdit/trunk/org/gjt/sp/jedit/msg/ViewUpdate.java
jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java
jEdit/trunk/org/gjt/sp/jedit/pluginmgr/CachePluginList.java
jEdit/trunk/org/gjt/sp/jedit/pluginmgr/RemotePluginList.java
jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
jEdit/trunk/org/gjt/sp/jedit/proto/jeditresource/PluginResURLConnection.java
jEdit/trunk/org/gjt/sp/jedit/search/SearchDialog.java
jEdit/trunk/org/gjt/sp/jedit/syntax/Chunk.java
jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java
jEdit/trunk/org/gjt/sp/jedit/syntax/TokenMarker.java
jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java
jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java
jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
jEdit/trunk/org/gjt/sp/util/AwtRunnableQueue.java
jEdit/trunk/org/gjt/sp/util/IOUtilities.java
jEdit/trunk/org/gjt/sp/util/ReverseCharSequence.java
jEdit/trunk/org/gjt/sp/util/SegmentCharSequence.java
jEdit/trunk/org/gjt/sp/util/StringList.java
jEdit/trunk/org/jedit/io/Native2ASCIIEncoding.java
Added Paths:
-----------
jEdit/trunk/org/jedit/annotation/
jEdit/trunk/org/jedit/annotation/GuardedBy.java
jEdit/trunk/org/jedit/annotation/Nonnull.java
jEdit/trunk/org/jedit/annotation/NotThreadSafe.java
jEdit/trunk/org/jedit/annotation/Nullable.java
jEdit/trunk/org/jedit/annotation/ThreadSafe.java
Modified: jEdit/trunk/README.SRC.txt
===================================================================
--- jEdit/trunk/README.SRC.txt 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/README.SRC.txt 2023-10-11 19:19:41 UTC (rev 25691)
@@ -173,13 +173,6 @@
* Tips for Eclipse/NetBeans/IDE users:
-A file "jsr305.jar" contains definitions of the annotations
-used in jEdit source code. It is downloaded automatically by ivy
-as part of the ant build process, to your lib/compile subfolder.
-If you add that jar to the
-project properties - java build path - libraries, that will
-get rid of the compiler errors on the annotations.
-
A file "tools.jar" from the JDK is also needed in your
java build path.
Modified: jEdit/trunk/build.xml
===================================================================
--- jEdit/trunk/build.xml 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/build.xml 2023-10-11 19:19:41 UTC (rev 25691)
@@ -239,10 +239,6 @@
compiler="modern"
encoding="UTF-8"
includeAntRuntime="false">
- <classpath id="classpath.compile">
- <fileset dir="${lib.dir}/compile"
- includes="*.jar"/>
- </classpath>
<include name="org/**"/>
<compilerarg line="${config.build.compilerarg}"/>
</javac>
@@ -430,9 +426,6 @@
compiler="modern"
encoding="UTF-8"
includeAntRuntime="false">
- <classpath id="classpath.compile">
- <fileset dir="${lib.dir}/compile" includes="*.jar"/>
- </classpath>
<compilerarg line="${config.build.compilerarg}"/>
</javac>
</target>
Modified: jEdit/trunk/ivy.xml
===================================================================
--- jEdit/trunk/ivy.xml 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/ivy.xml 2023-10-11 19:19:41 UTC (rev 25691)
@@ -92,8 +92,6 @@
<dependency org="org.beanshell" name="bsh" rev="2.0b5" conf="scripting"/>
<dependency org="org.bouncycastle" name="bcpg-jdk15on" rev="1.62" conf="scripting"/>
- <dependency org="com.google.code.findbugs" name="jsr305" rev="3.0.2"/>
-
<dependency org="com.evolvedbinary.appbundler" name="appbundler" rev="1.0.4" conf="appbundler"/>
</dependencies>
</ivy-module>
Modified: jEdit/trunk/org/gjt/sp/jedit/ActionSet.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/ActionSet.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/ActionSet.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -31,7 +31,7 @@
import org.jedit.keymap.Keymap;
import org.gjt.sp.util.Log;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/EditPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/EditPane.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -30,8 +30,8 @@
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import org.gjt.sp.jedit.EditBus.EBHandler;
Modified: jEdit/trunk/org/gjt/sp/jedit/EditPlugin.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/EditPlugin.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/EditPlugin.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -26,7 +26,7 @@
import org.gjt.sp.jedit.menu.EnhancedMenu;
import org.gjt.sp.util.Log;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import java.io.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/GUIUtilities.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -44,7 +44,7 @@
import java.util.List;
import java.lang.ref.SoftReference;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import javax.swing.JButton;
Modified: jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/MiscUtilities.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -44,8 +44,8 @@
import org.gjt.sp.util.StandardUtilities;
import org.gjt.sp.util.StringList;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/PluginJAR.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -57,7 +57,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.SwingUtilities;
import org.gjt.sp.jedit.browser.VFSBrowser;
Modified: jEdit/trunk/org/gjt/sp/jedit/Registers.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/Registers.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/Registers.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -38,7 +38,7 @@
import org.gjt.sp.jedit.textarea.Selection;
import org.gjt.sp.util.Log;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/ServiceListHandler.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/ServiceListHandler.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/ServiceListHandler.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -32,7 +32,7 @@
import org.gjt.sp.util.XMLUtilities;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/View.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/View.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/View.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -39,8 +39,8 @@
import java.util.List;
import java.util.function.Consumer;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JMenu;
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSBrowser.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -26,7 +26,7 @@
import org.gjt.sp.jedit.EditBus.EBHandler;
import org.gjt.sp.jedit.bsh.*;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.border.EmptyBorder;
import javax.swing.event.*;
import javax.swing.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.browser;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.border.EmptyBorder;
import javax.swing.*;
import java.awt.BorderLayout;
Modified: jEdit/trunk/org/gjt/sp/jedit/buffer/BufferSegment.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/buffer/BufferSegment.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/buffer/BufferSegment.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -21,7 +21,7 @@
package org.gjt.sp.jedit.buffer;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
/**
* A read-only text segment from a buffer. Allows concatenation using a
Modified: jEdit/trunk/org/gjt/sp/jedit/buffer/JEditBuffer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/buffer/JEditBuffer.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/buffer/JEditBuffer.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -37,7 +37,7 @@
import org.gjt.sp.util.Log;
import org.gjt.sp.util.StandardUtilities;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.text.Position;
import javax.swing.text.Segment;
import java.util.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/buffer/PositionManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/buffer/PositionManager.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/buffer/PositionManager.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.buffer;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.text.Position;
import java.util.*;
import org.gjt.sp.util.Log;
Modified: jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/bufferset/BufferSet.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -32,7 +32,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
//}}}
/** An ordered list of buffers, normally attached to an EditPane
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DefaultInputHandler.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/DefaultInputHandler.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/DefaultInputHandler.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -29,7 +29,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
//}}}
/** The default input handler maps sequences of keystrokes into actions and inserts key typed events into the text area.
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/DockingLayoutManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/DockingLayoutManager.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/DockingLayoutManager.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -4,7 +4,7 @@
import java.util.Map;
import java.util.Objects;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.JOptionPane;
import org.gjt.sp.jedit.ActionSet;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/ExtendedGridLayout.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -16,7 +16,7 @@
package org.gjt.sp.jedit.gui;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/FilteredListModel.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/FilteredListModel.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/FilteredListModel.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -21,7 +21,7 @@
*/
package org.gjt.sp.jedit.gui;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import javax.swing.event.*;
import java.util.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/LogViewer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/LogViewer.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/LogViewer.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,7 +25,7 @@
//{{{ Imports
import java.awt.*;
import java.awt.event.*;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.event.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/PanelWindowContainer.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/PanelWindowContainer.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/PanelWindowContainer.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -45,7 +45,7 @@
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.Icon;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/PingPongList.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/PingPongList.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/PingPongList.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
//{{{ Imports
import org.gjt.sp.util.Log;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.*;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
Modified: jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/gui/StatusBar.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -34,7 +34,7 @@
import org.gjt.sp.util.TaskListener;
import org.gjt.sp.util.TaskManager;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
Modified: jEdit/trunk/org/gjt/sp/jedit/input/AbstractInputHandler.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/input/AbstractInputHandler.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/input/AbstractInputHandler.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -29,8 +29,8 @@
import java.awt.event.KeyEvent;
import java.util.Hashtable;
import java.util.StringTokenizer;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import org.gjt.sp.jedit.JEditAbstractEditAction;
import org.gjt.sp.jedit.gui.ShortcutPrefixActiveEvent;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/AutoDetection.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/AutoDetection.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/AutoDetection.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -34,7 +34,7 @@
import org.gjt.sp.jedit.bufferio.BufferIORequest;
import org.gjt.sp.util.Log;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/io/CharsetEncoding.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/CharsetEncoding.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/CharsetEncoding.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -31,7 +31,7 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CodingErrorAction;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/io/CopyFileWorker.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/CopyFileWorker.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/CopyFileWorker.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -29,8 +29,8 @@
import java.util.Objects;
import java.util.concurrent.CountDownLatch;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import org.gjt.sp.jedit.MiscUtilities;
import org.gjt.sp.util.Log;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/Encoding.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/Encoding.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/Encoding.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,7 +25,7 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
/**
* An interface to represent an encoding.
Modified: jEdit/trunk/org/gjt/sp/jedit/io/EncodingWithBOM.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/EncodingWithBOM.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/EncodingWithBOM.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -33,7 +33,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/io/FavoritesVFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/FavoritesVFS.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/FavoritesVFS.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -30,7 +30,7 @@
import org.gjt.sp.jedit.msg.DynamicMenuChanged;
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/io/FileRootsVFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/FileRootsVFS.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/FileRootsVFS.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,7 +25,7 @@
package org.gjt.sp.jedit.io;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.filechooser.FileSystemView;
import java.awt.Component;
import java.io.File;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/FileVFS.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -27,8 +27,8 @@
//{{{ Imports
import java.io.Closeable;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import javax.swing.filechooser.FileSystemView;
import javax.swing.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/RegexEncodingDetector.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -20,7 +20,7 @@
package org.gjt.sp.jedit.io;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.IOException;
Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFS.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFS.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFS.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -44,8 +44,8 @@
import org.gjt.sp.util.Task;
import org.gjt.sp.util.ThreadUtilities;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
//}}}
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/io/VFSManager.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.io;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.JOptionPane;
import java.awt.Component;
import java.awt.EventQueue;
Modified: jEdit/trunk/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/jEdit.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -40,8 +40,8 @@
import org.gjt.sp.jedit.View.ViewConfig;
import org.gjt.sp.jedit.bsh.UtilEvalError;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import java.awt.event.*;
import java.io.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/manager/BufferManagerImpl.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/manager/BufferManagerImpl.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/manager/BufferManagerImpl.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -32,7 +32,7 @@
import org.gjt.sp.util.AwtRunnableQueue;
import org.gjt.sp.util.StandardUtilities;
-import javax.annotation.concurrent.GuardedBy;
+import org.jedit.annotation.GuardedBy;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Predicate;
Modified: jEdit/trunk/org/gjt/sp/jedit/manager/ViewManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/manager/ViewManager.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/manager/ViewManager.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
import org.gjt.sp.jedit.View;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import java.util.List;
import java.util.function.Consumer;
Modified: jEdit/trunk/org/gjt/sp/jedit/manager/ViewManagerImpl.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/manager/ViewManagerImpl.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/manager/ViewManagerImpl.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import java.util.*;
import java.util.function.Consumer;
Modified: jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/menu/EnhancedMenuItem.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.menu;
//{{{ Imports
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import javax.swing.*;
import java.awt.*;
import org.gjt.sp.jedit.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/BufferUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/BufferUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/BufferUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.Objects;
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/DockableWindowUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/DockableWindowUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/DockableWindowUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,7 +25,7 @@
import org.gjt.sp.jedit.gui.DockableWindowManager;
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.Objects;
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/EditPaneUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/EditPaneUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/EditPaneUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -21,7 +21,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.Objects;
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/PluginUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/PluginUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/PluginUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,8 +24,8 @@
import java.io.File;
import java.util.Objects;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import org.gjt.sp.jedit.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/VFSUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/VFSUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/VFSUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -21,7 +21,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.Objects;
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/msg/ViewUpdate.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/msg/ViewUpdate.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/msg/ViewUpdate.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
import org.gjt.sp.jedit.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.Objects;
/**
Modified: jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/options/StatusBarOptionPane.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -33,7 +33,7 @@
import org.gjt.sp.jedit.gui.statusbar.Widget;
import org.gjt.sp.jedit.jEdit;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import javax.swing.table.AbstractTableModel;
Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/CachePluginList.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/CachePluginList.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/CachePluginList.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.util.Log;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/RemotePluginList.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/RemotePluginList.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/RemotePluginList.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -27,7 +27,7 @@
import org.gjt.sp.util.ProgressObserver;
import org.jedit.io.HttpException;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Modified: jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/pluginmgr/Roster.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.pluginmgr;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.SwingUtilities;
import java.awt.Component;
import java.io.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/proto/jeditresource/PluginResURLConnection.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/proto/jeditresource/PluginResURLConnection.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/proto/jeditresource/PluginResURLConnection.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -31,7 +31,7 @@
import java.net.URL;
import java.net.URLConnection;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import org.gjt.sp.jedit.MiscUtilities;
import org.gjt.sp.jedit.PluginJAR;
Modified: jEdit/trunk/org/gjt/sp/jedit/search/SearchDialog.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/search/SearchDialog.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/search/SearchDialog.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -23,7 +23,7 @@
package org.gjt.sp.jedit.search;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.border.*;
import javax.swing.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/Chunk.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/syntax/Chunk.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/syntax/Chunk.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,8 +24,8 @@
package org.gjt.sp.jedit.syntax;
//{{{ Imports
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import javax.swing.text.*;
import java.awt.font.*;
import java.awt.geom.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/syntax/ParserRuleSet.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
package org.gjt.sp.jedit.syntax;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.*;
import java.util.regex.Pattern;
//}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/syntax/TokenMarker.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/syntax/TokenMarker.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/syntax/TokenMarker.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
package org.gjt.sp.jedit.syntax;
//{{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.text.Segment;
import java.lang.ref.WeakReference;
import java.util.*;
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/InputMethodSupport.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
package org.gjt.sp.jedit.textarea;
// {{{ Imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.awt.geom.Rectangle2D;
import java.text.AttributedString;
import java.text.AttributedCharacterIterator;
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/SelectionManager.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -24,7 +24,7 @@
//{{{ Imports
import java.util.*;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import org.gjt.sp.jedit.buffer.*;
//}}}
Modified: jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java
===================================================================
--- jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/jedit/textarea/TextArea.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -28,7 +28,7 @@
import java.text.BreakIterator;
import java.text.CharacterIterator;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.*;
import javax.swing.Timer;
import javax.swing.event.*;
Modified: jEdit/trunk/org/gjt/sp/util/AwtRunnableQueue.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/AwtRunnableQueue.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/util/AwtRunnableQueue.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,8 +25,8 @@
import java.awt.EventQueue;
import java.util.LinkedList;
-import javax.annotation.concurrent.GuardedBy;
-import javax.annotation.concurrent.ThreadSafe;
+import org.jedit.annotation.GuardedBy;
+import org.jedit.annotation.ThreadSafe;
/**
* A queue for runnables that should run in the EDT after all pending
Modified: jEdit/trunk/org/gjt/sp/util/IOUtilities.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/IOUtilities.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/util/IOUtilities.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -25,7 +25,7 @@
import java.io.*;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nullable;
/**
* IO tools that depend on JDK only.
Modified: jEdit/trunk/org/gjt/sp/util/ReverseCharSequence.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/ReverseCharSequence.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/util/ReverseCharSequence.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -20,7 +20,7 @@
package org.gjt.sp.util;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
/**
* Reversed view of a given CharSequence.
Modified: jEdit/trunk/org/gjt/sp/util/SegmentCharSequence.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/SegmentCharSequence.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/util/SegmentCharSequence.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -21,7 +21,7 @@
package org.gjt.sp.util;
import java.io.Serializable;
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import javax.swing.text.Segment;
/**
Modified: jEdit/trunk/org/gjt/sp/util/StringList.java
===================================================================
--- jEdit/trunk/org/gjt/sp/util/StringList.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/gjt/sp/util/StringList.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -22,7 +22,7 @@
package org.gjt.sp.util;
//{{{ imports
-import javax.annotation.Nonnull;
+import org.jedit.annotation.Nonnull;
import java.util.ArrayList;
import java.util.Collection;
//}}}
Added: jEdit/trunk/org/jedit/annotation/GuardedBy.java
===================================================================
--- jEdit/trunk/org/jedit/annotation/GuardedBy.java (rev 0)
+++ jEdit/trunk/org/jedit/annotation/GuardedBy.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -0,0 +1,31 @@
+/* FileOpenerService.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=sidekick:collapseFolds=1:
+ *
+ * Copyright © 2023 Matthieu Casanova
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.jedit.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+public @interface GuardedBy
+{
+ String value();
+}
Added: jEdit/trunk/org/jedit/annotation/Nonnull.java
===================================================================
--- jEdit/trunk/org/jedit/annotation/Nonnull.java (rev 0)
+++ jEdit/trunk/org/jedit/annotation/Nonnull.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -0,0 +1,30 @@
+/* FileOpenerService.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=sidekick:collapseFolds=1:
+ *
+ * Copyright © 2023 Matthieu Casanova
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.jedit.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+public @interface Nonnull
+{
+}
Added: jEdit/trunk/org/jedit/annotation/NotThreadSafe.java
===================================================================
--- jEdit/trunk/org/jedit/annotation/NotThreadSafe.java (rev 0)
+++ jEdit/trunk/org/jedit/annotation/NotThreadSafe.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -0,0 +1,30 @@
+/* FileOpenerService.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=sidekick:collapseFolds=1:
+ *
+ * Copyright © 2023 Matthieu Casanova
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.jedit.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface NotThreadSafe
+{
+}
Added: jEdit/trunk/org/jedit/annotation/Nullable.java
===================================================================
--- jEdit/trunk/org/jedit/annotation/Nullable.java (rev 0)
+++ jEdit/trunk/org/jedit/annotation/Nullable.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -0,0 +1,30 @@
+/* FileOpenerService.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=sidekick:collapseFolds=1:
+ *
+ * Copyright © 2023 Matthieu Casanova
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.jedit.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
+public @interface Nullable
+{
+}
Added: jEdit/trunk/org/jedit/annotation/ThreadSafe.java
===================================================================
--- jEdit/trunk/org/jedit/annotation/ThreadSafe.java (rev 0)
+++ jEdit/trunk/org/jedit/annotation/ThreadSafe.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -0,0 +1,30 @@
+/* FileOpenerService.java
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=sidekick:collapseFolds=1:
+ *
+ * Copyright © 2023 Matthieu Casanova
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.jedit.annotation;
+
+import java.lang.annotation.*;
+
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface ThreadSafe
+{
+}
Modified: jEdit/trunk/org/jedit/io/Native2ASCIIEncoding.java
===================================================================
--- jEdit/trunk/org/jedit/io/Native2ASCIIEncoding.java 2023-10-09 20:38:43 UTC (rev 25690)
+++ jEdit/trunk/org/jedit/io/Native2ASCIIEncoding.java 2023-10-11 19:19:41 UTC (rev 25691)
@@ -35,8 +35,8 @@
import java.nio.charset.CharsetEncoder;
import java.nio.charset.MalformedInputException;
import java.nio.charset.StandardCharsets;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.jedit.annotation.Nonnull;
+import org.jedit.annotation.Nullable;
import org.gjt.sp.jedit.io.CharsetEncoding;
import org.gjt.sp.jedit.io.Encoding;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
