Skip to content

Commit

Permalink
Re-introduced AEV RAP feature
Browse files Browse the repository at this point in the history
  • Loading branch information
sebjulliand committed May 17, 2024
1 parent 4d816af commit 1e5f54f
Show file tree
Hide file tree
Showing 31 changed files with 290 additions and 18 deletions.
2 changes: 1 addition & 1 deletion bundles/aev.core.services/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ Export-Package: com.arcadsoftware.ae.core.exceptions,
com.arcadsoftware.ae.core.utils.io
Import-Package: org.w3c.dom
Bundle-ClassPath: .
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Bundle-ActivationPolicy: lazy
7 changes: 7 additions & 0 deletions bundles/aev.core.ui.rap/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
33 changes: 33 additions & 0 deletions bundles/aev.core.ui.rap/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>aev.core.ui.rap</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ds.core.builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
20 changes: 20 additions & 0 deletions bundles/aev.core.ui.rap/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ARCAD-Evolution Core UI RAP
Automatic-Module-Name: com.arcadsoftware.aev.core.ui.rap
Bundle-SymbolicName: com.arcadsoftware.aev.core.ui.rap;singleton:=true
Bundle-Version: 12.0.2.qualifier
Require-Bundle: com.arcadsoftware.aev.core.ui,
com.arcadsoftware.aev.core,
org.eclipse.rap.ui;bundle-version="3.6.0",
org.eclipse.rap.ui.forms;bundle-version="3.6.0",
org.eclipse.rap.filedialog;bundle-version="3.6.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: ARCAD-Software
Export-Package: com.arcadsoftware.aev.core.ui.common,
com.arcadsoftware.aev.core.ui.rap.dialogs,
com.arcadsoftware.aev.core.ui.rap.tools
Import-Package: org.osgi.service.component.annotations;resolution:=optional
Service-Component: OSGI-INF/com.arcadsoftware.aev.core.ui.rap.dialogs.RAPDialogConstantFiller.xml,
OSGI-INF/com.arcadsoftware.aev.core.ui.rap.tools.FileManagerProvider.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" immediate="true" name="com.arcadsoftware.aev.core.ui.rap.dialogs.RAPDialogConstantFiller">
<service>
<provide interface="com.arcadsoftware.aev.core.ui.dialogs.IDialogConstantFiller"/>
</service>
<implementation class="com.arcadsoftware.aev.core.ui.rap.dialogs.RAPDialogConstantFiller"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.arcadsoftware.aev.core.ui.rap.tools.FileManagerProvider">
<service>
<provide interface="com.arcadsoftware.aev.core.ui.tools.IFileManagerProvider"/>
</service>
<implementation class="com.arcadsoftware.aev.core.ui.rap.tools.FileManagerProvider"/>
</scr:component>
5 changes: 5 additions & 0 deletions bundles/aev.core.ui.rap/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.arcadsoftware.aev.core.ui.common;

import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;

public class FormToolKitUtils {

public static void paintBordersFor(final FormToolkit toolkit, final Composite composite) {
// toolkit.paintBordersFor(composite);
// there is nothing to do when using RAP.
}

public static void setOrientationRightToLeft(final FormToolkit toolkit) {
// Not supported by RAP !
// toolkit.setOrientation(SWT.RIGHT_TO_LEFT);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.arcadsoftware.aev.core.ui.rap.dialogs;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.osgi.service.component.annotations.Component;

import com.arcadsoftware.aev.core.ui.dialogs.DialogConstantProvider;
import com.arcadsoftware.aev.core.ui.dialogs.IDialogConstantFiller;

@Component(service = IDialogConstantFiller.class, immediate = true)
public class RAPDialogConstantFiller implements IDialogConstantFiller {

@Override
public void fill(final DialogConstantProvider provider) {
provider.OK_LABEL = IDialogConstants.get().OK_LABEL;
provider.CANCEL_LABEL = IDialogConstants.get().CANCEL_LABEL;
provider.YES_LABEL = IDialogConstants.get().YES_LABEL;
provider.NO_LABEL = IDialogConstants.get().NO_LABEL;
provider.NO_TO_ALL_LABEL = IDialogConstants.get().NO_TO_ALL_LABEL;
provider.YES_TO_ALL_LABEL = IDialogConstants.get().YES_TO_ALL_LABEL;
provider.SKIP_LABEL = IDialogConstants.get().SKIP_LABEL;
provider.STOP_LABEL = IDialogConstants.get().STOP_LABEL;
provider.ABORT_LABEL = IDialogConstants.get().ABORT_LABEL;
provider.RETRY_LABEL = IDialogConstants.get().RETRY_LABEL;

provider.IGNORE_LABEL = IDialogConstants.get().IGNORE_LABEL;
provider.PROCEED_LABEL = IDialogConstants.get().PROCEED_LABEL;
provider.OPEN_LABEL = IDialogConstants.get().OPEN_LABEL;
provider.CLOSE_LABEL = IDialogConstants.get().CLOSE_LABEL;
provider.SHOW_DETAILS_LABEL = IDialogConstants.get().SHOW_DETAILS_LABEL;
provider.HIDE_DETAILS_LABEL = IDialogConstants.get().HIDE_DETAILS_LABEL;

provider.BACK_LABEL = IDialogConstants.get().BACK_LABEL;
provider.NEXT_LABEL = IDialogConstants.get().NEXT_LABEL;
provider.FINISH_LABEL = IDialogConstants.get().FINISH_LABEL;
provider.HELP_LABEL = IDialogConstants.get().HELP_LABEL;

}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package com.arcadsoftware.aev.core.ui.rap.tools;

import java.io.File;
import java.io.InputStream;
import java.util.List;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.osgi.service.component.annotations.Component;

import com.arcadsoftware.aev.core.ui.tools.IFileManagerProvider;

@Component(service = IFileManagerProvider.class)
public class FileManagerProvider implements IFileManagerProvider {
@Override
public boolean isSelectorAvailable() {
return false;
}

@Override
public void openFile(final File file) {
// We do nothing under RAP Execution
}

@Override
public void openFileFromStream(final InputStream stream, final String tempFileName) {
// We do nothing under RAP Execution
}

@Override
public String selectDirectory(final Shell shell, final int actionStyle, final String title) {
return null;
}

@Override
public String selectFile(final Shell shell, final int actionStyle, final String title,
final String[] fileExtensions) {
final FileDialog fileDialog = new FileDialog(shell, SWT.OPEN | SWT.APPLICATION_MODAL);
// fileDialog.setFilterExtensions(fileExtensions);
fileDialog.setText(title);
return fileDialog.open();
}

@Override
public String selectFile(final Shell shell, final int actionStyle, final String title,
final String[] fileExtensions, final String filename) {
return null;
}

@Override
public List<String> selectFiles(final Shell shell, final int actionStyle, final String title,
final String[] fileExtensions) {
return null;
}

}
2 changes: 1 addition & 1 deletion bundles/aev.core.ui.rcp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: ARCAD-Evolution Core UI RCP
Automatic-Module-Name: com.arcadsoftware.aev.core.ui.rcp
Bundle-SymbolicName: com.arcadsoftware.aev.core.ui.rcp;singleton:=true
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
com.arcadsoftware.aev.core,
Expand Down
2 changes: 1 addition & 1 deletion bundles/aev.core.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: ARCAD-Evolution Core UI
Automatic-Module-Name: com.arcadsoftware.aev.core.ui
Bundle-SymbolicName: com.arcadsoftware.aev.core.ui;singleton:=true
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Bundle-Activator: com.arcadsoftware.aev.core.ui.EvolutionCoreUIPlugin
Bundle-Vendor: ARCAD Software
Bundle-Localization: plugin
Expand Down
2 changes: 1 addition & 1 deletion bundles/aev.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ARCAD-Evolution Core
Bundle-SymbolicName: com.arcadsoftware.aev.core;singleton:=true
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: com.arcadsoftware.aev.core.EvolutionCorePlugin
Bundle-Vendor: ARCAD Software
Expand Down
2 changes: 1 addition & 1 deletion bundles/aev.icons/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ARCAD Evolutions Icons
Bundle-SymbolicName: com.arcadsoftware.aev.icons
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Bundle-Vendor: ARCAD Software
Automatic-Module-Name: com.arcadsoftware.aev.icons
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Expand Down
2 changes: 1 addition & 1 deletion bundles/aev.list.manager/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ Import-Package: com.arcadsoftware.ae.core.exceptions,
Bundle-ClassPath: .,
libs/org.apache.servicemix.bundles.xpp3-1.1.4c_7.jar,
libs/hsqldb-2.7.1-jdk8.jar
Bundle-Version: 12.0.1
Bundle-Version: 12.0.2.qualifier
Bundle-ActivationPolicy: lazy
3 changes: 2 additions & 1 deletion bundles/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.arcadsoftware</groupId>
<artifactId>com.arcadsoftware.aev</artifactId>
<version>12.0.1</version>
<version>12.0.2-SNAPSHOT</version>
</parent>

<artifactId>com.arcadsoftware.aev.bundles</artifactId>
Expand All @@ -15,6 +15,7 @@
<module>aev.core</module>
<module>aev.core.ui</module>
<module>aev.core.ui.rcp</module>
<module>aev.core.ui.rap</module>
<module>aev.icons</module>
</modules>
</project>
2 changes: 1 addition & 1 deletion features/aev.core.features/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.arcadsoftware.aev.core.features"
label="ARCAD-Evolution Core"
version="12.0.1"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/aev.core.ui.features/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.arcadsoftware.aev.core.ui.features"
label="ARCAD-Evolution Core UI"
version="12.0.1"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/aev.list.features/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.arcadsoftware.aev.list.features"
label="ARCAD-Evolution List Manager"
version="12.0.1"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Expand Down
23 changes: 23 additions & 0 deletions features/aev.rap.features/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>aev.rap.features</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
1 change: 1 addition & 0 deletions features/aev.rap.features/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin.includes = feature.xml
35 changes: 35 additions & 0 deletions features/aev.rap.features/feature.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.arcadsoftware.aev.rap.features"
label="ARCAD-Evolution RAP"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Contains the ARCAD Evolution RAP bundle and its dependencies.
</description>

<copyright url="http://www.arcadsoftware.com">
(c) ARCAD-Software, All Rights Reserved.
</copyright>

<license url="http://www.arcadsoftware.com">
General ARCAD-Software Commercial License
(c) 2021, ARCAD Software, all rights reserved.
The software and documentation cannot be used without explicit
authorization of ARCAD-Software.
Please refer to the global ARCAD products licence for details.
</license>

<includes
id="com.arcadsoftware.aev.core.ui.features"
version="0.0.0"/>

<plugin
id="com.arcadsoftware.aev.core.ui.rap"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion features/aev.rcp.features/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.arcadsoftware.aev.rcp.features"
label="ARCAD-Evolution RCP"
version="12.0.1"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Expand Down
2 changes: 1 addition & 1 deletion features/aev.services.features/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="com.arcadsoftware.aev.services.features"
label="ARCAD-Evolution Services"
version="12.0.1"
version="12.0.2.qualifier"
provider-name="ARCAD-Software">

<description>
Expand Down
3 changes: 2 additions & 1 deletion features/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.arcadsoftware</groupId>
<artifactId>com.arcadsoftware.aev</artifactId>
<version>12.0.1</version>
<version>12.0.2-SNAPSHOT</version>
</parent>

<artifactId>com.arcadsoftware.aev.features</artifactId>
Expand All @@ -15,5 +15,6 @@
<module>aev.core.features</module>
<module>aev.core.ui.features</module>
<module>aev.rcp.features</module>
<module>aev.rap.features</module>
</modules>
</project>
Loading

0 comments on commit 1e5f54f

Please sign in to comment.