Skip to content

Commit

Permalink
Multiple changes:
Browse files Browse the repository at this point in the history
* Switch from dynamic to static profile
* Multiple changes in profile
* Add derived attributes and constraints
* Update example model according to new profile (incomplete)
* Switch to version 0.2.0
  • Loading branch information
abelgomez committed Mar 2, 2017
1 parent 40e7010 commit 04bca89
Show file tree
Hide file tree
Showing 69 changed files with 10,634 additions and 3,054 deletions.
4 changes: 2 additions & 2 deletions examples/io.github.abelgomez.ps.example/publish-subscribe.di
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
<?xml version="1.0" encoding="UTF-8"?>
<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
1,544 changes: 533 additions & 1,011 deletions examples/io.github.abelgomez.ps.example/publish-subscribe.notation

Large diffs are not rendered by default.

284 changes: 94 additions & 190 deletions examples/io.github.abelgomez.ps.example/publish-subscribe.uml

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions features/io.github.abelgomez.ps.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="io.github.abelgomez.ps.feature"
label="Publish-Subscribe Tools"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
provider-name="Abel Gómez">

<description url="https://github.com/SOM-Research/publish-subscribe/">
Expand Down Expand Up @@ -126,14 +126,14 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="io.github.abelgomez.ps.profile"
download-size="0"
install-size="0"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
unpack="false"/>

<plugin
id="io.github.abelgomez.ps.transformer"
download-size="0"
install-size="0"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
unpack="false"/>

</feature>
4 changes: 2 additions & 2 deletions features/io.github.abelgomez.ps.sdk.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="io.github.abelgomez.ps.sdk.feature"
label="Publish-Subscribe Tools SDK"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
provider-name="Abel Gómez">

<description url="https://github.com/SOM-Research/publish-subscribe/">
Expand Down Expand Up @@ -135,7 +135,7 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="io.github.abelgomez.ps.transformer.test"
download-size="0"
install-size="0"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
unpack="false"/>

</feature>
11 changes: 9 additions & 2 deletions features/io.github.abelgomez.ps.ui.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<feature
id="io.github.abelgomez.ps.ui.feature"
label="Publish-Subscribe Tools UI"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
provider-name="Abel Gómez">

<description url="https://github.com/SOM-Research/publish-subscribe/">
Expand Down Expand Up @@ -130,7 +130,14 @@ This Agreement is governed by the laws of the State of New York and the intellec
id="io.github.abelgomez.ps.transformer.ui"
download-size="0"
install-size="0"
version="0.1.1.qualifier"
version="0.2.0.qualifier"
unpack="false"/>

<plugin
id="io.github.abelgomez.ps.profile.ui"
download-size="0"
install-size="0"
version="0.2.0.qualifier"
unpack="false"/>

</feature>
7 changes: 7 additions & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/.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>
1 change: 1 addition & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/bin/
28 changes: 28 additions & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>io.github.abelgomez.ps.profile.ui</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>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=false
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
12 changes: 12 additions & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Publish-Subscribe Profile UI Plug-in
Bundle-SymbolicName: io.github.abelgomez.ps.profile.ui;singleton:=true
Bundle-Version: 0.2.0.qualifier
Bundle-Vendor: Abel Gómez
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.uml2.uml.edit;bundle-version="5.1.0",
org.eclipse.papyrus.uml.tools;bundle-version="2.0.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
io.github.abelgomez.ps.profile;bundle-version="0.2.0"
Bundle-ActivationPolicy: lazy
5 changes: 5 additions & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
12 changes: 12 additions & 0 deletions plugins/io.github.abelgomez.ps.profile.ui/plugin.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
point="org.eclipse.papyrus.infra.services.labelprovider.labelProvider">
<labelProvider
priority="10"
provider="io.github.abelgomez.ps.profile.ui.providers.AssignmentOperationLabelProvider">
</labelProvider>
</extension>

</plugin>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package io.github.abelgomez.ps.profile.ui.providers;

import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.papyrus.infra.services.labelprovider.service.IFilteredLabelProvider;
import org.eclipse.papyrus.infra.ui.emf.providers.EMFLabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.uml2.uml.UMLFactory;
import org.eclipse.uml2.uml.edit.providers.DataTypeItemProvider;
import org.eclipse.uml2.uml.edit.providers.UMLItemProviderAdapterFactory;

import io.github.abelgomez.ps.AssignmentOperation;

public class AssignmentOperationLabelProvider extends EMFLabelProvider implements IFilteredLabelProvider {

private static final Image PROPERTY_IMAGE = ExtendedImageRegistry.getInstance().getImage(new DataTypeItemProvider(
new UMLItemProviderAdapterFactory()).getImage(UMLFactory.eINSTANCE.createProperty()));

@Override
public String getText(Object element) {
AssignmentOperation assignmentOperation = (AssignmentOperation) element;
StringBuilder builder = new StringBuilder();
builder.append(assignmentOperation.getProperty());
builder.append(" = ");
builder.append(assignmentOperation.getValue());
return builder.toString();
}

@Override
public boolean accept(Object element) {
return element instanceof AssignmentOperation;
}

@Override
public Image getImage(Object element) {
return PROPERTY_IMAGE;
}
}
1 change: 1 addition & 0 deletions plugins/io.github.abelgomez.ps.profile/.classpath
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src-gen"/>
<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="output" path="bin"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
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
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
sp_cleanup.add_missing_override_annotations_interface_methods=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=false
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=false
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=false
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=false
sp_cleanup.remove_unused_imports=false
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=false
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_lambda=true
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
19 changes: 14 additions & 5 deletions plugins/io.github.abelgomez.ps.profile/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Publish-Subscribe Profile Plug-in
Bundle-Name: %pluginName
Bundle-SymbolicName: io.github.abelgomez.ps.profile;singleton:=true
Bundle-Version: 0.1.2.qualifier
Bundle-Vendor: Abel Gómez
Bundle-Version: 0.2.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.12.0",
org.eclipse.uml2.uml;bundle-version="5.2.0",
Export-Package: io.github.abelgomez.ps,
io.github.abelgomez.ps.impl,
io.github.abelgomez.ps.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;bundle-version="2.12.0";visibility:=reexport,
org.eclipse.uml2.types;visibility:=reexport,
org.eclipse.uml2.uml;bundle-version="5.2.0";visibility:=reexport,
org.eclipse.ocl.ecore;visibility:=reexport,
org.eclipse.papyrus.uml.extensionpoints;bundle-version="1.2.0"
Bundle-ActivationPolicy: lazy
2 changes: 2 additions & 0 deletions plugins/io.github.abelgomez.ps.profile/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# Contributors:
# Abel Gómez ([email protected]) - initial API and implementation
###############################################################################
source.. = src-gen/
output.. = bin/
bin.includes = META-INF/,\
.,\
resources/,\
Expand Down
14 changes: 14 additions & 0 deletions plugins/io.github.abelgomez.ps.profile/plugin.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
###############################################################################
# Copyright (c) 2016 Abel Gómez.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
#
# Contributors:
# Abel Gómez ([email protected]) - initial API and implementation
###############################################################################

pluginName = Publish-Subscribe Profile Plug-in
providerName = Abel Gómez

Loading

0 comments on commit 04bca89

Please sign in to comment.