Skip to content

Commit

Permalink
Integrated function block editor with devtool. Added missing files fr…
Browse files Browse the repository at this point in the history
…om previous commit

Signed-off-by: shiv12095 <shiv12095@iiitd.ac.in>
  • Loading branch information
shiv12095 committed Jul 25, 2016
1 parent 8f4ea15 commit 0de6bd7
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 19 deletions.
5 changes: 5 additions & 0 deletions bundles/org.eclipse.vorto.editor.functionblock.web/pom.xml
Expand Up @@ -78,6 +78,11 @@
<artifactId>org.eclipse.vorto.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.datatype</artifactId>
Expand Down
Expand Up @@ -28,7 +28,7 @@ import org.eclipse.xtext.web.servlet.XtextServlet
/**
* Deploy this class into a servlet container to enable DSL-specific services.
*/
@WebServlet(name = 'XtextServices', urlPatterns = '/xtext-service/*')
@WebServlet(name = 'Functionblock XtextServices', urlPatterns = '/funcitonblock/xtext-service/')
class FunctionblockServlet extends XtextServlet {

val List<ExecutorService> executorServices = newArrayList
Expand Down
Expand Up @@ -3,26 +3,33 @@
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
*
*
* The Eclipse Public License is available at
* http://www.eclipse.org/legal/epl-v10.html
* The Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
*
* Contributors:
* Bosch Software Innovations GmbH - Please refer to git log
*
*
*******************************************************************************/
/*
* generated by Xtext
*/
package org.eclipse.vorto.editor.functionblock.web

import org.eclipse.vorto.editor.web.resource.WebEditorResourceSetProvider
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
import org.eclipse.xtext.web.server.model.IWebResourceSetProvider

/**
* Use this class to register additional components to be used within the web application.
*/
@FinalFieldsConstructor
class FunctionblockWebModule extends AbstractFunctionblockWebModule {

def Class<? extends IWebResourceSetProvider> bindIWebResourceSetProvider() {
return WebEditorResourceSetProvider
}

}
5 changes: 5 additions & 0 deletions bundles/org.eclipse.vorto.editor.infomodel.web/pom.xml
Expand Up @@ -78,6 +78,11 @@
<artifactId>org.eclipse.vorto.core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.web</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.vorto</groupId>
<artifactId>org.eclipse.vorto.editor.datatype</artifactId>
Expand Down
Expand Up @@ -30,7 +30,7 @@ import org.eclipse.vorto.editor.functionblock.FunctionblockStandaloneSetup
/**
* Deploy this class into a servlet container to enable DSL-specific services.
*/
@WebServlet(name = 'XtextServices', urlPatterns = '/xtext-service/*')
@WebServlet(name = 'InformationModel XtextServices', urlPatterns = '/infomodel/xtext-service/')
class InformationModelServlet extends XtextServlet {

val List<ExecutorService> executorServices = newArrayList
Expand Down
Expand Up @@ -3,22 +3,22 @@
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
*
*
* The Eclipse Public License is available at
* http://www.eclipse.org/legal/epl-v10.html
* The Eclipse Distribution License is available at
* http://www.eclipse.org/org/documents/edl-v10.php.
*
*
* Contributors:
* Bosch Software Innovations GmbH - Please refer to git log
*
*
*******************************************************************************/
/*
* generated by Xtext
*/
package org.eclipse.vorto.editor.infomodel.web

import org.eclipse.vorto.editor.infomodel.web.resource.InformationModelResourceSetProvider
import org.eclipse.vorto.editor.web.resource.WebEditorResourceSetProvider
import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
import org.eclipse.xtext.web.server.model.IWebResourceSetProvider

Expand All @@ -27,8 +27,8 @@ import org.eclipse.xtext.web.server.model.IWebResourceSetProvider
*/
@FinalFieldsConstructor
class InformationModelWebModule extends AbstractInformationModelWebModule {

def Class<? extends IWebResourceSetProvider> bindIWebResourceSetProvider() {
return InformationModelResourceSetProvider
}
return WebEditorResourceSetProvider
}
}
80 changes: 80 additions & 0 deletions bundles/org.eclipse.vorto.editor.web/pom.xml
@@ -0,0 +1,80 @@
<?xml version="1.0"?>
<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.eclipse.vorto</groupId>
<artifactId>bundles</artifactId>
<version>0.4.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.vorto.editor.web</artifactId>

<name>Vorto Editor Web</name>

<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.xtend</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>add-source</id>
<phase>initialize</phase>
<goals>
<goal>add-source</goal>
<goal>add-resource</goal>
</goals>
<configuration>
<sources>
<source>src-gen</source>
</sources>
<resources>
<resource>
<directory>src-gen</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.xbase.web</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtext</groupId>
<artifactId>org.eclipse.xtext.web.servlet</artifactId>
<version>${xtext.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.xtend</groupId>
<artifactId>org.eclipse.xtend.lib</artifactId>
<version>${xtext.version}</version>
</dependency>
</dependencies>

</project>
@@ -0,0 +1,42 @@
package org.eclipse.vorto.editor.web.resource

import com.google.inject.Inject
import java.util.HashSet
import java.util.Set
import javax.inject.Provider
import javax.inject.Singleton
import org.eclipse.emf.ecore.resource.ResourceSet
import org.eclipse.xtext.web.server.IServiceContext
import org.eclipse.xtext.web.server.model.IWebResourceSetProvider

@Singleton
class WebEditorResourceSetProvider implements IWebResourceSetProvider {

@Inject package Provider<ResourceSet> provider

override ResourceSet get(String resourceId, IServiceContext serviceContext) {
return getResourceSetFromSession(serviceContext)
}

def ResourceSet getResourceSetFromSession(IServiceContext serviceContext) {
if (serviceContext.getSession().get("set") === null) {
var ResourceSet resourceSet = provider.get()
serviceContext.getSession().put("set", resourceSet)
println(resourceSet);
return resourceSet
} else {
println(serviceContext.getSession().get("set"));
return serviceContext.getSession().get("set")
}
}

def Set<String> getReferencedResourcesFromSession(IServiceContext serviceContext) {
if (serviceContext.getSession().get("referenceSet") === null) {
var HashSet<String> referencedResourceSet = new HashSet()
serviceContext.getSession().put("referenceSet", referencedResourceSet)
return referencedResourceSet
} else {
return serviceContext.getSession().get("referenceSet")
}
}
}
12 changes: 5 additions & 7 deletions bundles/pom.xml
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="MACROMAN"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

<parent>
<groupId>org.eclipse.vorto</groupId>
Expand All @@ -21,6 +19,7 @@
<module>org.eclipse.vorto.core.ui</module>
<module>org.eclipse.vorto.editor</module>
<module>org.eclipse.vorto.editor.ui</module>
<module>org.eclipse.vorto.editor.web</module>

<module>org.eclipse.vorto.editor.datatype</module>
<module>org.eclipse.vorto.editor.datatype.ui</module>
Expand Down Expand Up @@ -49,7 +48,6 @@
<module>org.eclipse.vorto.wizard</module>
<module>org.eclipse.vorto.repository</module>
<module>org.eclipse.vorto.perspective</module>
</modules>

</modules>

</project>
</project>

0 comments on commit 0de6bd7

Please sign in to comment.