From 182f53bcd4f1128e7698e9292b46aed905d82201 Mon Sep 17 00:00:00 2001 From: shiv12095 Date: Mon, 15 Aug 2016 20:47:08 +0530 Subject: [PATCH] Added project resource namespace and name Signed-off-by: shiv12095 --- .../devtool/controller/ProjectController.java | 4 +- .../devtool/models/ProjectResource.java | 40 ++++++++++++++----- .../service/IProjectRepositoryService.java | 2 +- .../impl/ProjectRepositoryServiceImpl.java | 5 +-- .../resources/static/dist/js/controllers.js | 19 ++++++--- .../resources/static/dist/js/devtoolApp.js | 3 +- .../resources/static/dist/js/directives.js | 1 - 7 files changed, 50 insertions(+), 24 deletions(-) diff --git a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/controller/ProjectController.java b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/controller/ProjectController.java index 28eb1cd0bc..f8266a8626 100644 --- a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/controller/ProjectController.java +++ b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/controller/ProjectController.java @@ -127,7 +127,7 @@ public void deleteProjectResource( @ApiOperation(value = "Creates a new resource in the Vorto project") @RequestMapping(value = "/{projectName}/resources/create", method = RequestMethod.POST) - public void getProjectResourceContents( + public void createProjectResource( @RequestBody ProjectResource projectResoure, @ApiParam(value = "ProjectName", required = true) final @PathVariable String projectName, @ApiParam(value = "Request", required = true) final HttpServletRequest request) @@ -135,7 +135,7 @@ public void getProjectResourceContents( Objects.requireNonNull(projectName, "projectName must not be null"); String sessionId = request.getSession().getId(); - projectRepositoryService.createResource(sessionId, projectName, projectResoure.getName(), projectResoure.getResourceId()); + projectRepositoryService.createResource(sessionId, projectName, projectResoure); } @ApiOperation(value = "Returns a list of resources in the Vorto project") diff --git a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/models/ProjectResource.java b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/models/ProjectResource.java index 8ec68a40d9..835327e362 100644 --- a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/models/ProjectResource.java +++ b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/models/ProjectResource.java @@ -1,33 +1,55 @@ package org.eclipse.vorto.server.devtool.models; public class ProjectResource { - + private String resourceId; private String name; + private String version; + private String namespace; + public String getResourceId() { return resourceId; } + public void setResourceId(String resourceId) { this.resourceId = resourceId; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + @Override public boolean equals(Object obj) { - if(obj.getClass().equals(this.getClass())){ - ProjectResource projectResource = (ProjectResource)obj; - if(projectResource.getResourceId().equals(this.resourceId)){ + if (obj.getClass().equals(this.getClass())) { + ProjectResource projectResource = (ProjectResource) obj; + if (projectResource.getResourceId().equals(this.resourceId)) { +// if (projectResource.getName().endsWith(this.name)) { +// return true; +// } return true; - }else{ - return false; } - }else{ - return false; } - } + return false; + } } diff --git a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/IProjectRepositoryService.java b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/IProjectRepositoryService.java index 851ebb0ccd..2cfbc5424d 100644 --- a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/IProjectRepositoryService.java +++ b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/IProjectRepositoryService.java @@ -19,7 +19,7 @@ public interface IProjectRepositoryService { ArrayList getProjectResources(String sessionId, String projectName) throws ProjectNotFoundException; - void createResource(String sessionId, String projectName, String resourceName, String resourceId) throws ProjectNotFoundException; + void createResource(String sessionId, String projectName, ProjectResource projectResource) throws ProjectNotFoundException; void deleteResource(String sessionId, String projectName, String resourceId) throws ProjectNotFoundException; } diff --git a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/impl/ProjectRepositoryServiceImpl.java b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/impl/ProjectRepositoryServiceImpl.java index ebf9584e63..15b7c91003 100644 --- a/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/impl/ProjectRepositoryServiceImpl.java +++ b/server/devtool/src/main/java/org/eclipse/vorto/server/devtool/service/impl/ProjectRepositoryServiceImpl.java @@ -77,12 +77,9 @@ public ArrayList getProjects(String sessionId) { } @Override - public void createResource(String sessionId, String projectName, String resourceName, String resourceId) throws ProjectNotFoundException { + public void createResource(String sessionId, String projectName, ProjectResource projectResource) throws ProjectNotFoundException { Project project = openProject(sessionId, projectName); ArrayList resourceList = project.getResourceList(); - ProjectResource projectResource = new ProjectResource(); - projectResource.setResourceId(resourceId); - projectResource.setName(resourceName); resourceList.add(projectResource); } diff --git a/server/devtool/src/main/resources/static/dist/js/controllers.js b/server/devtool/src/main/resources/static/dist/js/controllers.js index 6bfb9f7111..f40608b044 100644 --- a/server/devtool/src/main/resources/static/dist/js/controllers.js +++ b/server/devtool/src/main/resources/static/dist/js/controllers.js @@ -48,7 +48,6 @@ define(["angular"], function(angular) { $scope.getResources = function() { $http.get('./project/' + $scope.projectName + '/resources').success( function(data, status, headers, config) { - console.log(data); for (i = 0; i < data.length; i++) { $scope.openEditor(data[i]); } @@ -96,6 +95,8 @@ define(["angular"], function(angular) { editorDivId: editorDivId, language: language, name: resource.name, + version: resource.version, + namespace: resource.namespace, resourceId: resource.resourceId }; $scope.tabs.push(tab); @@ -211,9 +212,14 @@ define(["angular"], function(angular) { var resourceId = $scope.selectedEditor.xtextServices.validationService._encodedResourceId; var tab = $scope.tabs[$scope.selectedTabIndex]; tab['resourceId'] = resourceId; + tab['name'] = model.name; + tab['version'] = model.version; + tab['namespace'] = model.namespace; $http.post('./project/' + $scope.projectName + '/resources/create', { "name": model.name, - "resourceId": resourceId + "resourceId": resourceId, + "version": model.version, + "namespace": model.namespace }).success( function(data, status, headers, config) {}).error(function(data, status, headers, config) {}); }); @@ -239,9 +245,14 @@ define(["angular"], function(angular) { var resourceId = $scope.selectedEditor.xtextServices.validationService._encodedResourceId; var tab = $scope.tabs[$scope.selectedTabIndex]; tab['resourceId'] = resourceId; + tab['name'] = model.name; + tab['version'] = model.version; + tab['namespace'] = model.namespace; $http.post('./project/' + $scope.projectName + '/resources/create', { "name": model.name, - "resourceId": resourceId + "resourceId": resourceId, + "version": model.version, + "namespace": model.namespace }).success( function(data, status, headers, config) {}).error(function(data, status, headers, config) {}); }); @@ -322,7 +333,6 @@ define(["angular"], function(angular) { var resources = []; $http.get('./project/' + $scope.projectName + '/resources').success( function(data, status, headers, config) { - console.log(data); var modalInstance = $uibModal.open({ animation: true, controller: 'OpenResourceModalController', @@ -413,7 +423,6 @@ define(["angular"], function(angular) { $http.get('./editor/infomodel/search=' + filter).success( function(data, status, headers, config) { $scope.models = data; - console.log(data); }).error(function(data, status, headers, config) { $scope.models = []; }); diff --git a/server/devtool/src/main/resources/static/dist/js/devtoolApp.js b/server/devtool/src/main/resources/static/dist/js/devtoolApp.js index 5aadeb465d..af62cbeff6 100644 --- a/server/devtool/src/main/resources/static/dist/js/devtoolApp.js +++ b/server/devtool/src/main/resources/static/dist/js/devtoolApp.js @@ -27,9 +27,8 @@ define("devtoolApp", ["angular", "angular-route", "angular-animate", "angular-ar $rootScope.getRepositoryBasePath = function() { $http.get('./repository/basepath').success(function(data, status, headers, config) { $rootScope.repoBasePath = data['basepath']; - console.log($rootScope.repoBasePath); }).error(function(data, status, headers, config) { - $rootScope.repoBasePath = "/"; + $rootScope.repoBasePath = "http://vorto.eclipse.org/#/"; }); } diff --git a/server/devtool/src/main/resources/static/dist/js/directives.js b/server/devtool/src/main/resources/static/dist/js/directives.js index 9c6a9f14b5..0a30954a0e 100644 --- a/server/devtool/src/main/resources/static/dist/js/directives.js +++ b/server/devtool/src/main/resources/static/dist/js/directives.js @@ -7,7 +7,6 @@ define(["angular"], function(angular) { link: function(scope, elem, attrs, ctrl) { elem.on('blur', function(evt) { scope.$apply(function() { - console.log("Calling request : " + elem.val()); if (elem.val()) { $http.get('./project/' + elem.val() + '/check').success( function(data, status, headers, config) {