CleanUp
diff --git a/r/org.eclipse.statet.r.console.core/src/org/eclipse/statet/r/nico/impl/RjsController.java b/r/org.eclipse.statet.r.console.core/src/org/eclipse/statet/r/nico/impl/RjsController.java
index e2f77fd..27f81bd 100644
--- a/r/org.eclipse.statet.r.console.core/src/org/eclipse/statet/r/nico/impl/RjsController.java
+++ b/r/org.eclipse.statet.r.console.core/src/org/eclipse/statet/r/nico/impl/RjsController.java
@@ -56,7 +56,6 @@
import org.eclipse.statet.jcommons.status.ProgressMonitor;
import org.eclipse.statet.jcommons.status.Status;
import org.eclipse.statet.jcommons.status.StatusException;
-import org.eclipse.statet.jcommons.status.Statuses;
import org.eclipse.statet.jcommons.status.eplatform.EStatusUtils;
import org.eclipse.statet.jcommons.ts.core.ToolCommandHandler;
import org.eclipse.statet.jcommons.ts.core.ToolRunnable;
@@ -616,7 +615,7 @@
"Login requested but not supported by this configuration." ));
}
if (loginHandler.execute(LOGIN_REQUEST_EVENT_ID, this, data, m).getSeverity() != Status.OK) {
- throw new StatusException(Statuses.CANCEL_STATUS);
+ throw new StatusException(Status.CANCEL_STATUS);
}
if (fx != null) {
diff --git a/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/internal/r/debug/core/breakpoints/RGenericLineBreakpoint.java b/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/internal/r/debug/core/breakpoints/RGenericLineBreakpoint.java
index 9b01bdc..de87e25 100644
--- a/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/internal/r/debug/core/breakpoints/RGenericLineBreakpoint.java
+++ b/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/internal/r/debug/core/breakpoints/RGenericLineBreakpoint.java
@@ -22,6 +22,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
import org.eclipse.statet.r.debug.core.breakpoints.IRLineBreakpoint;
@@ -221,7 +223,7 @@
}
@Override
- public String getSubLabel() throws CoreException {
+ public @Nullable String getSubLabel() throws CoreException {
return ensureMarker().getAttribute(SUB_LABEL_MARKER_ATTR, null);
}
@@ -237,7 +239,7 @@
}
@Override
- public void setConditionExpr(final String code) throws CoreException {
+ public void setConditionExpr(final @Nullable String code) throws CoreException {
final IMarker marker= ensureMarker();
if (code != null && code.trim().length() > 0) {
marker.setAttribute(CONDITION_EXPR_MARKER_ATTR, code);
diff --git a/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/r/debug/core/breakpoints/IRLineBreakpoint.java b/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/r/debug/core/breakpoints/IRLineBreakpoint.java
index e4bde3f..af7409c 100644
--- a/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/r/debug/core/breakpoints/IRLineBreakpoint.java
+++ b/r/org.eclipse.statet.r.debug.core/src/org/eclipse/statet/r/debug/core/breakpoints/IRLineBreakpoint.java
@@ -17,7 +17,11 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.model.ILineBreakpoint;
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
+@NonNullByDefault
public interface IRLineBreakpoint extends IRBreakpoint, ILineBreakpoint {
int R_COMMON_FUNCTION_ELEMENT_TYPE = 1;
@@ -33,7 +37,7 @@
int getElementType() throws CoreException;
// String getElementId() throws CoreException;
- String getElementLabel() throws CoreException;
- String getSubLabel() throws CoreException;
+ @Nullable String getElementLabel() throws CoreException;
+ @Nullable String getSubLabel() throws CoreException;
}
