Skip to content
Snippets Groups Projects
Commit ae468887 authored by al.schwinn's avatar al.schwinn
Browse files

updated release branch

parent 145d9665
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 687 additions and 195 deletions
silecs-eclipse-plugin/.classpath
+ 3
− 2
View file @ ae468887
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="ext-jars/xml-apis-1.3.04.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/java"/>
<classpathentry exported="true" kind="lib" path="target/lib/xalan-2.7.2.jar"/>
<classpathentry exported="true" kind="lib" path="target/lib/jaxen-1.1.6.jar"/>
<classpathentry exported="true" kind="lib" path="jaxen-1.1.6.jar"/>
<classpathentry exported="true" kind="lib" path="xalan-2.7.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
silecs-eclipse-plugin/.gitignore
+ 4
− 3
View file @ ae468887
/*.jar
/ext-jars/*.jar
/target
\ No newline at end of file
/target/
/ext-jars/*
/jaxen-1.1.6.jar
/xalan-2.7.2.jar
silecs-eclipse-plugin/.project
+ 0
− 5
View file @ ae468887
......@@ -5,11 +5,6 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.python.pydev.PyDevBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
......
silecs-eclipse-plugin/.settings/org.eclipse.jdt.core.prefs
+ 1
− 0
View file @ ae468887
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
......
silecs-eclipse-plugin/META-INF/MANIFEST.MF
+ 6
− 26
View file @ ae468887
......@@ -4,6 +4,7 @@ Bundle-Name: %Bundle-Name
Bundle-SymbolicName: silecs.eclipse.plugin;singleton:=true
Bundle-Version: 1.1.1.qualifier
Bundle-Activator: cern.silecs.activator.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.workbench,
......@@ -38,35 +39,15 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.cdt.make.core;bundle-version="7.3.0",
org.eclipse.cdt.make.ui;bundle-version="7.2.0",
org.eclipse.cdt.managedbuilder.core;bundle-version="8.3.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,
target/lib/xalan-2.7.2.jar,
target/lib/jaxen-1.1.6.jar
ext-jars/xalan-2.7.2.jar,
ext-jars/jaxen-1.1.6.jar,
ext-jars/xml-apis-1.3.04.jar
Permissions: all-permissions
Codebase: http://abwww.cern.ch/ap/dist/silecs/1.m.p/configuration/
Application-Name: Silecs-Eclipse-Plugin
Export-Package: cern.silecs.activator,
cern.silecs.control.core,
cern.silecs.control.handlers,
cern.silecs.control.validation,
cern.silecs.control.validation.internal;x-internal:=true,
cern.silecs.model.document,
cern.silecs.model.exception,
cern.silecs.utils,
cern.silecs.view,
cern.silecs.view.console,
cern.silecs.view.dialogs,
cern.silecs.view.editor,
cern.silecs.view.editor.internal;x-internal:=true,
cern.silecs.view.explorer,
cern.silecs.view.job,
cern.silecs.view.marker,
cern.silecs.view.preferences,
cern.silecs.view.wizards,
cern.silecs.view.wizards.page,
java_cup.runtime,
org.apache.bcel,
Export-Package: org.apache.bcel,
org.apache.bcel.classfile,
org.apache.bcel.generic,
org.apache.bcel.util,
......@@ -130,5 +111,4 @@ Export-Package: cern.silecs.activator,
org.jaxen.saxpath.helpers,
org.jaxen.util,
org.jaxen.xom,
org.w3c.dom,
trax
org.w3c.dom
silecs-eclipse-plugin/build.properties
+ 6
− 4
View file @ ae468887
......@@ -5,12 +5,14 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/,\
src/scripts/,\
JNLP-INF/,\
src/java/,\
target/lib/jaxen-1.1.6.jar,\
target/lib/xalan-2.7.2.jar,\
OSGI-INF/
OSGI-INF/,\
ext-jars/xml-apis-1.3.04.jar,\
ext-jars/xalan-2.7.2.jar,\
ext-jars/serializer-2.7.2.jar,\
jaxen-1.1.6.jar,\
xalan-2.7.2.jar
src.includes = src/
jars.compile.order = .
qualifier = context
silecs-eclipse-plugin/build.xml 0 → 100644
+ 527
− 0
View file @ ae468887
This diff is collapsed.
silecs-eclipse-plugin/pom.xml
+ 122
− 86
View file @ ae468887
......@@ -2,99 +2,135 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.gsi.cs.co</groupId>
<artifactId>csco-parent</artifactId>
<version>1.0.7</version>
</parent>
<groupId>silecs-eclipse-plugin</groupId>
<artifactId>silecs-eclipse-plugin</artifactId>
<version>0.10.0</version>
<parent>
<groupId>de.gsi.cs.co</groupId>
<artifactId>csco-parent</artifactId>
<version>1.0.7</version>
</parent>
<groupId>de.gsi.cs.co.fe</groupId>
<artifactId>silecs.eclipse.plugin</artifactId>
<name>silecs-eclipse-plugin</name>
<packaging>jar</packaging>
<description>adfsfasfa.</description>
<url>sdasdasdasdasd</url>
<developers>
<developer>
<id></id>
<name></name>
<email></email>
<url></url>
</developer>
</developers>
<packaging>eclipse-plugin</packaging>
<version>1.1.1.qualifier</version>
<description>Management of Silecs projects</description>
<url>https://www-acc.gsi.de/wiki/Frontend/SILECS</url>
<properties>
<tycho-version>0.21.0</tycho-version>
<platform-version-name>mars</platform-version-name>
<eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
</properties>
<profiles>
<profile>
<id>platform-mars</id>
<activation>
<property>
<name>platform-version-name</name>
<value>mars</value>
</property>
</activation>
<properties>
<eclipse-site>http://download.eclipse.org/releases/mars</eclipse-site>
<platform-version>[4.4,4.6)</platform-version>
<swtbot-site>http://download.eclipse.org/technology/swtbot/mars/dev-build/update-site</swtbot-site>
</properties>
</profile>
</profiles>
<repositories>
<repository>
<id>default</id>
<url>https://artifacts.acc.gsi.de/nexus/content/repositories/default</url>
</repository>
<repository>
<id>mars</id>
<layout>p2</layout>
<url>${eclipse-site}</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>2.7.2</version>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy</id>
<phase>package</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</artifactItem>
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</artifactItem>
<artifactItem>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</artifactItem>
<artifactItem>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/lib</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.10</version>
<configuration>
<pde>true</pde>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerVersion>1.8</compilerVersion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>copy-dependencies</id>
<phase>process-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</artifactItem>
<artifactItem>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
</artifactItem>
</artifactItems>
<outputDirectory>${basedir}/ext-jars</outputDirectory>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>2.3</version>
<configuration>
<filesets>
<fileset>
<directory>${basedir}/ext-jars</directory>
<includes>
<include>*.jar</include>
</includes>
<followSymlinks>false</followSymlinks>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
<configuration>
<pomDependencies>consider</pomDependencies>
<executionEnvironment>JavaSE-1.8</executionEnvironment>
</configuration>
</plugin>
</plugins>
</build>
</project>
silecs-eclipse-plugin/src/java/cern/silecs/utils/SilecsConstants.java
+ 1
− 7
View file @ ae468887
......@@ -51,15 +51,9 @@ public class SilecsConstants {
public static final String DEPLOY_PATTERN = "[A-Z][A-Za-z0-9_]*";
public static final int MAX_DESIGN_LENGTH = 12;
public static final int MAX_DESIGN_LENGTH = 20;
public static final int MAX_DEPLOY_LENGTH = 20;
public static final String CLASS_VERSION_PATTERN = "[0-9]*\\.[0-9]*\\.[0-9]*";
public static final String IEPLC_3_VERSION_PATTERN = "[0-9]*";
public static final String FULL_DESIGN_PATTERN = "[A-Z][A-Za-z0-9_]*[_][0-9]\\.[0-9]\\.[0-9]";
// SILECS versions which are supported by this plugin
public static final String[] SUPPORTED_SILECS_MAJOR_VERSIONS = { "1","DEV"};
......
silecs-eclipse-plugin/src/java/cern/silecs/utils/SilecsUtils.java
+ 1
− 1
View file @ ae468887
......@@ -208,7 +208,7 @@ public class SilecsUtils {
}
}
public static void openInEditor(IFile file)
public static void openInEditor(final IFile file)
{
Display.getDefault().asyncExec(new Runnable() {
@Override
......
silecs-eclipse-plugin/src/java/cern/silecs/view/ApplicationWorkbenchAdvisor.java
+ 0
− 46
View file @ ae468887
......@@ -64,8 +64,6 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
PlatformUI.getPreferenceStore().setValue(IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS, false);
IDE.registerAdapters();
addGenerateClassEnumListener();
}
@Override
......@@ -73,48 +71,4 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
return ResourcesPlugin.getWorkspace().getRoot();
}
public void printClassPath() {
ClassLoader cl = ClassLoader.getSystemClassLoader();
URL[] urls = ((URLClassLoader)cl).getURLs();
for(URL url: urls){
System.out.println(url.getFile());
}
}
/**
* This methods adds a listener that should regenerate class enum whenever design project is deleted
*/
private void addGenerateClassEnumListener() {
ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
@Override
public void resourceChanged(IResourceChangeEvent event) {
IResourceDelta rootDelta = event.getDelta();
try {
rootDelta.accept(delta -> {
IResource resource = delta.getResource();
// make sure that the project has been removed and it was a design project
if (resource instanceof IProject
&& (delta.getKind() == IResourceDelta.REMOVED || delta.getKind() == IResourceDelta.ADDED)
&& resource.getName().matches(SilecsConstants.FULL_DESIGN_PATTERN)) {
try {
XmlUtils.reloadDependencies();
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
return true;
});
} catch (CoreException e) {
e.printStackTrace();
}
}
}, IResourceChangeEvent.POST_CHANGE);
}
}
silecs-eclipse-plugin/src/java/cern/silecs/view/ApplicationWorkbenchWindowAdvisor.java
+ 12
− 12
View file @ ae468887
......@@ -160,18 +160,18 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
}
private void setApplicationTitle() {
IEditorPart editorPart = page.getActiveEditor();
IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
if (editorPart != null) {
IFileEditorInput editorInput = (IFileEditorInput) editorPart.getEditorInput();
IFile file = editorInput.getFile();
configurer.setTitle(file.getFullPath() + " - " + SilecsConstants.SILECS_NAME + " - "
+ ResourcesPlugin.getWorkspace());
} else {
configurer.setTitle(SilecsConstants.SILECS_NAME + " - " + ResourcesPlugin.getWorkspace() );
}
// IEditorPart editorPart = page.getActiveEditor();
// IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
//
// if (editorPart != null) {
// IFileEditorInput editorInput = (IFileEditorInput) editorPart.getEditorInput();
// IFile file = editorInput.getFile();
//
// configurer.setTitle(file.getFullPath() + " - " + SilecsConstants.SILECS_NAME + " - "
// + ResourcesPlugin.getWorkspace());
// } else {
// configurer.setTitle(SilecsConstants.SILECS_NAME + " - " + ResourcesPlugin.getWorkspace() );
// }
}
});
......
silecs-eclipse-plugin/src/java/cern/silecs/view/explorer/SilecsProjectExplorer.java
+ 4
− 3
View file @ ae468887
......@@ -64,9 +64,9 @@ public class SilecsProjectExplorer extends CommonNavigator {
CommonViewer viewer = getCommonViewer();
IActionBars bars = getViewSite().getActionBars();
IStatusLineManager lineManager = bars.getStatusLineManager();
final IStatusLineManager lineManager = bars.getStatusLineManager();
ILabelProvider labelProvider = (ILabelProvider) viewer.getLabelProvider();
final ILabelProvider labelProvider = (ILabelProvider) viewer.getLabelProvider();
viewer.addPostSelectionChangedListener(new ISelectionChangedListener() {
......@@ -167,7 +167,8 @@ public class SilecsProjectExplorer extends CommonNavigator {
toExpand.add(0, parent);
} while ((parent = parent.getParent()) != root);
boolean expand = !getCommonViewer().getExpandedState(project);
toExpand.forEach(o -> expand(o, expand));
for(Object o: toExpand )
expand(o, expand);
} catch (Exception e) {
e.printStackTrace();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy