ST6RI-682 Changed output format in magic commands

Author: TheKorpos

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java

@@ -440,12 +440,10 @@ public String loadByName(String projectName, List<String> help) {
 		}
 
 		ProjectRepository repository = new ProjectRepository(apiBasePath);
-		
-		System.out.println("Locating model");
 		RepositoryProject repositoryProject = repository.getProjectByName(projectName);
 
 		if (repositoryProject == null) {
-			return "ERROR:Publication doesn't exist.";
+			return "ERROR:Project doesn't exist.";
 		}
 
 		return load(repositoryProject);
@@ -457,26 +455,18 @@ public String loadById(String projectId, List<String> help) {
 		}
 
 		ProjectRepository repository = new ProjectRepository(apiBasePath);
-		
-		System.out.println("Locating model");
 		RepositoryProject repositoryProject = repository.getPRojectById(UUID.fromString(projectId));
 
 		if (repositoryProject == null) {
-			return "ERROR:Publication doesn't exist.";
+			return "ERROR:Project doesn't exist.";
 		}
 
 		return load(repositoryProject);
 	}
 
 	private String load(RepositoryProject repositoryProject) {
-		boolean success = repositoryProject.loadRemote();
-		
-		if (!success) {
-			return "ERROR:Could not download the publication.";
-		}
-		
-		System.out.println("Collecting UUIDs...");
 		if (!tracker.isLibraryTracked()) {
+			System.out.println("Caching library UUIDs...");
 			tracker.trackLibraryUUIDs(getLibraryResources());
 		}
 
@@ -485,13 +475,18 @@ private String load(RepositoryProject repositoryProject) {
 		//UUIDS coming from resources that were added later in time will shadow previous ones
 		tracker.trackUserUUIDs(inputResources);
 
+		System.out.println("Downloading model...");
+		boolean success = repositoryProject.loadRemote();
+		
+		if (!success) {
+			return "ERROR:Could not download the project.";
+		}
+		
 		RepositoryContentFetcher fetcher = new RepositoryContentFetcher(repositoryProject, tracker);
 
-		System.out.println("Downloading model...");
 		ProjectDelta delta = fetcher.fetch();
 		fetcher.getIssues().forEach(System.out::println);
 
-		System.out.println("Adding model to index");
 		delta.getProjectRoots().forEach((eObject, dto) -> {
 			next(SYSMLX_EXTENSION);
 			Resource xmiResource = getResource();
@@ -505,7 +500,7 @@ private String load(RepositoryProject repositoryProject) {
 			addResourceToIndex(xmiResource);
 		});
 
-		return "Project loaded: " + repositoryProject.getProjectName() + ", " + repositoryProject.getProjectId().toString();
+		return "Loaded Project " + repositoryProject.getProjectName() + " (" + repositoryProject.getProjectId().toString() + ")";
 	}
 
 	protected String download(String name) {
@@ -514,14 +509,17 @@ protected String download(String name) {
 				loadByName(name, Collections.emptyList());
 	}
 
-	public String listPublications(List<String> help) {
+	public String projects(List<String> help) {
 		if (help != null && !help.isEmpty()) {
 			return SysMLInteractiveHelp.getProjectsHelp();
 		}
 		ProjectRepository projectRepository = new ProjectRepository(apiBasePath);
+		
+		String apiBasePathString = "API base path: " + apiBasePath;
 		List<RepositoryProject> repositoryProjects = projectRepository.getProjects();
-		return repositoryProjects.stream().map(p -> String.format("name=%s, id=%s", p.getProjectName(), p.getProjectId()))
+		String projectsListString = repositoryProjects.stream().map(p -> String.format("Project %s (%s)", p.getProjectName(), p.getProjectId()))
 				.collect(Collectors.joining("\n"));
+		return apiBasePathString + "\n\n" + projectsListString;
 	}
 
 	protected ApiElementProcessingFacade getApiElementProcessingFacade(String modelName) {

org.omg.sysml.jupyter.kernel/src/main/java/org/omg/sysml/jupyter/kernel/magic/Projects.java

@@ -38,6 +38,6 @@ public class Projects {
 	public static String projects(List<String> args) {
         Map<String, List<String>> vals = SHOW_ARGS.parse(args);
         List<String> help = vals.get("help");
-		return ISysML.getKernelInstance().getInteractive().listPublications(help);
+		return ISysML.getKernelInstance().getInteractive().projects(help);
 	}
 }