mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-11-01 16:40:26 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-1469: Code cleanup: Fix probable bugs: Add NotNull annotations

Browse Source
This commit is contained in:
arthur 2020-11-13 22:14:35 +03:00
parent 7e6c4db774
commit f6f273307d
8 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/jivesoftware/spark/component/FileDragLabel.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.component;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.spark.util.log.Log;
import java.awt.datatransfer.DataFlavor;
@ -154,6 +155,7 @@ public class FileDragLabel extends JLabel implements DropTargetListener, DragSou
}
@NotNull
@Override
public synchronized Object getTransferData(DataFlavor flavor)
throws UnsupportedFlavorException, IOException {

2
core/src/main/java/org/jivesoftware/spark/component/JiveTreeNode.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.component;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.resource.SparkRes;
import javax.swing.Icon;
@ -223,6 +224,7 @@ public class JiveTreeNode extends DefaultMutableTreeNode implements Transferable
}
@NotNull
@Override
public Object getTransferData(DataFlavor flavor)
throws UnsupportedFlavorException, IOException {

4
core/src/main/java/org/jivesoftware/spark/component/tabbedPane/SparkTabbedPane.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.component.tabbedPane;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.Spark;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.spark.SparkManager;
@ -507,7 +508,8 @@ public class SparkTabbedPane extends JPanel {
final Transferable t = new Transferable() {
private final DataFlavor FLAVOR = new DataFlavor(DataFlavor.javaJVMLocalObjectMimeType, NAME);
@Override
@NotNull
@Override
public Object getTransferData(DataFlavor flavor)
throws UnsupportedFlavorException, IOException {
return pane;

4
core/src/main/java/org/jivesoftware/spark/ui/ChatRoomTransferHandler.java
View File

@ -25,6 +25,7 @@ import java.util.Collection;
import javax.swing.JComponent;
import javax.swing.TransferHandler;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.spark.util.log.Log;
/**
@ -131,8 +132,9 @@ public class ChatRoomTransferHandler extends TransferHandler {
}
// Returns Selected Text
@NotNull
@Override
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
if (!DataFlavor.stringFlavor.equals(flavor)) {
throw new UnsupportedFlavorException(flavor);
}

2
core/src/main/java/org/jivesoftware/spark/ui/ContactGroupTransferHandler.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.ui;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.resource.Res;
import org.jivesoftware.smack.SmackException;
import org.jivesoftware.smack.roster.Roster;
@ -164,6 +165,7 @@ public class ContactGroupTransferHandler extends TransferHandler {
}
// Returns image
@NotNull
@Override
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
if (!DataFlavor.imageFlavor.equals(flavor)) {

23
core/src/main/java/org/jivesoftware/spark/util/Base64.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.util;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.spark.util.log.Log;
/**
@ -978,26 +979,20 @@ public class Base64 {
* @since 1.3
*/
@Override
public int read(byte[] dest, int off, int len) throws java.io.IOException {
public int read(@NotNull byte[] dest, int off, int len) throws java.io.IOException {
int i;
int b;
for (i = 0; i < len; i++) {
b = read();
//if( b < 0 && i == 0 )
// return -1;
int b = read();
if (b >= 0)
dest[off + i] = (byte)b;
dest[off + i] = (byte) b;
else if (i == 0)
return -1;
else
break; // Out of 'for' loop
} // end for: each byte read
break;
}
return i;
} // end read
} // end inner class InputStream
}
}
/* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
@ -1132,7 +1127,7 @@ public class Base64 {
* @since 1.3
*/
@Override
public void write(byte[] theBytes, int off, int len) throws java.io.IOException {
public void write(@NotNull byte[] theBytes, int off, int len) throws java.io.IOException {
// Encoding suspended?
if (suspendEncoding) {
super.out.write(theBytes, off, len);

6
core/src/main/java/org/jivesoftware/spark/util/ByteFormat.java
View File

@ -15,6 +15,8 @@
*/
package org.jivesoftware.spark.util;
import org.jetbrains.annotations.NotNull;
import java.text.DecimalFormat;
import java.text.FieldPosition;
import java.text.Format;
@ -60,7 +62,7 @@ public class ByteFormat extends Format {
* @return A formatted string representing the given bytes in more human-readable form.
*/
@Override
public StringBuffer format(Object obj, StringBuffer buf, FieldPosition pos) {
public StringBuffer format(Object obj, @NotNull StringBuffer buf, @NotNull FieldPosition pos) {
if (obj instanceof Long) {
long numBytes = (Long) obj;
if (numBytes < 1024) {
@ -91,7 +93,7 @@ public class ByteFormat extends Format {
* @return returns null in this implementation.
*/
@Override
public Object parseObject(String source, ParsePosition pos) {
public Object parseObject(String source, @NotNull ParsePosition pos) {
return null;
}
}

5
core/src/main/java/org/jivesoftware/spark/util/TaskEngine.java
View File

@ -15,6 +15,7 @@
*/
package org.jivesoftware.spark.util;
import org.jetbrains.annotations.NotNull;
import org.jivesoftware.spark.util.log.Log;
import java.util.Date;
@ -65,7 +66,7 @@ public class TaskEngine {
final AtomicInteger threadNumber = new AtomicInteger(1);
@Override
public Thread newThread(Runnable runnable) {
public Thread newThread(@NotNull Runnable runnable) {
// Use our own naming scheme for the threads.
Thread thread = new Thread(Thread.currentThread().getThreadGroup(), runnable,
"pool-spark" + threadNumber.getAndIncrement(), 0);
@ -323,4 +324,4 @@ public class TaskEngine {
executor.submit(task);
}
}
}
}