Skip to content

Commit 0f9de19

Browse files
committed
NXT-4224: Code style changes
NXT-4224 (Automatically / Manually sync when editing workflows in the browser)
1 parent a35e798 commit 0f9de19

File tree

3 files changed

+6
-50
lines changed

3 files changed

+6
-50
lines changed

org.knime.ui.java/src/eclipse/org/knime/ui/java/api/DesktopAPI.java

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.eclipse.swt.widgets.Display;
6363
import org.knime.core.node.NodeLogger;
6464
import org.knime.gateway.api.service.GatewayException;
65-
import org.knime.ui.java.util.ProgressReporter;
6665
import org.knime.gateway.api.webui.entity.GatewayProblemDescriptionEnt;
6766
import org.knime.gateway.api.webui.service.util.MutableServiceCallException;
6867
import org.knime.gateway.api.webui.service.util.ServiceExceptions.LoggedOutException;
@@ -86,6 +85,7 @@
8685
import org.knime.ui.java.profile.UserProfile;
8786
import org.knime.ui.java.util.ExampleProjects;
8887
import org.knime.ui.java.util.MostRecentlyUsedProjects;
88+
import org.knime.ui.java.util.ProgressReporter;
8989

9090
import com.fasterxml.jackson.core.JsonProcessingException;
9191
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -268,7 +268,7 @@ private static Object invokeMethod(final Method m, final Object[] args) throws T
268268
* @param progressReporter
269269
* @throws IllegalStateException if the dependencies have been already injected
270270
*/
271-
@SuppressWarnings({"java:S107", "JavadocDeclaration", "javadoc"}) // Parameter count
271+
@SuppressWarnings({"java:S107", "JavadocDeclaration"}) // Parameter count
272272
public static void injectDependencies( //
273273
final ProjectManager projectManager, //
274274
final WorkflowMiddleware workflowMiddleware, //
@@ -309,65 +309,30 @@ static void injectDependency(final UserProfile userProfile) {
309309
DEPENDENCIES.put(UserProfile.class, userProfile);
310310
}
311311

312-
/**
313-
* Add individual dependency for testing purposes.
314-
*
315-
* @param eventConsumer
316-
*/
317312
static void injectDependency(final EventConsumer eventConsumer) {
318313
DEPENDENCIES.put(EventConsumer.class, eventConsumer);
319314
}
320315

321-
/**
322-
* Add individual dependency for testing purposes.
323-
*
324-
* @param localSpace
325-
*/
326316
static void injectDependency(final LocalSpace localSpace) {
327317
DEPENDENCIES.put(LocalSpace.class, localSpace);
328318
}
329319

330-
/**
331-
* Add individual dependency for testing purposes.
332-
*
333-
* @param projectManager
334-
*/
335320
static void injectDependency(final ProjectManager projectManager) {
336321
DEPENDENCIES.put(ProjectManager.class, projectManager);
337322
}
338323

339-
/**
340-
* Add individual dependency for testing purposes.
341-
*
342-
* @param appStateUpdater
343-
*/
344324
static void injectDependency(final AppStateUpdater appStateUpdater) {
345325
DEPENDENCIES.put(AppStateUpdater.class, appStateUpdater);
346326
}
347327

348-
/**
349-
* Add individual dependency for testing purposes.
350-
*
351-
* @param spaceProvidersManager
352-
*/
353328
static void injectDependency(final SpaceProvidersManager spaceProvidersManager) {
354329
DEPENDENCIES.put(SpaceProvidersManager.class, spaceProvidersManager);
355330
}
356331

357-
/**
358-
* Add individual dependency for testing purposes.
359-
*
360-
* @param mruProjects
361-
*/
362332
static void injectDependency(final MostRecentlyUsedProjects mruProjects) {
363333
DEPENDENCIES.put(MostRecentlyUsedProjects.class, mruProjects);
364334
}
365335

366-
/**
367-
* Add individual dependency for testing purposes.
368-
*
369-
* @param exampleProjects
370-
*/
371336
static void injectDependency(final ExampleProjects exampleProjects) {
372337
DEPENDENCIES.put(ExampleProjects.class, exampleProjects);
373338
}

org.knime.ui.java/src/eclipse/org/knime/ui/java/api/OpenProject.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.knime.core.node.workflow.contextv2.HubSpaceLocationInfo;
5959
import org.knime.core.util.Pair;
6060
import org.knime.core.util.hub.NamedItemVersion;
61-
import org.knime.ui.java.util.ProgressReporter;
6261
import org.knime.gateway.api.util.VersionId;
6362
import org.knime.gateway.api.webui.entity.SpaceItemReferenceEnt.ProjectTypeEnum;
6463
import org.knime.gateway.api.webui.entity.SpaceItemVersionEnt;
@@ -75,6 +74,7 @@
7574
import org.knime.ui.java.util.CreateProject;
7675
import org.knime.ui.java.util.DesktopAPUtil;
7776
import org.knime.ui.java.util.MostRecentlyUsedProjects;
77+
import org.knime.ui.java.util.ProgressReporter;
7878
import org.knime.workbench.core.imports.RepoObjectImport;
7979

8080
/**
@@ -136,7 +136,8 @@ static void openProject(final String spaceId, final String itemId, final String
136136
project = optProject.get();
137137
} else {
138138
final var origin = new Origin(spaceProviderId, spaceId, itemId, projectType);
139-
project = CreateProject.createProjectFromOrigin(origin, DesktopAPI.getDeps(ProgressReporter.class), space);
139+
final var progressReporter = DesktopAPI.getDeps(ProgressReporter.class);
140+
project = CreateProject.createProjectFromOrigin(origin, progressReporter, space);
140141
}
141142

142143
// already trigger loading of wfm here because we want to abort and not register the project if this fails

org.knime.ui.java/src/eclipse/org/knime/ui/java/util/CreateProject.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,7 @@ public static Project createProjectFromOrigin(final Origin origin, final Progres
103103
return createProjectFromOrigin(projectId, name, origin, progressReporter, space);
104104
}
105105

106-
/**
107-
* Create a {@link Project} instance that corresponds to an {@link Origin}, i.e. an item in a {@link Space}.
108-
*
109-
* @param projectId -
110-
* @param name -
111-
* @param origin -
112-
* @param progressReporter -
113-
* @param space -
114-
* @return -
115-
*/
116-
public static Project createProjectFromOrigin(final String projectId, final String name, final Origin origin,
106+
private static Project createProjectFromOrigin(final String projectId, final String name, final Origin origin,
117107
final ProgressReporter progressReporter, final Space space) {
118108
return Project.builder() //
119109
.setWfmLoader(fromOriginWithProgressReporter(origin, progressReporter, space)) //

0 commit comments

Comments
 (0)