Commit afad0042 authored by Christian Kniss's avatar Christian Kniss
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request ERZ/RW_de.bsvrz.buv.plugin.dobj!10
parents 7f827dc4 9969bcb4
RW_de.bsvrz.buv.plugin.dobj-build:
RW_de.bsvrz.buv.plugin.dobj-build-java-8:
interruptible: true
image:
maven:3.6.0-jdk-8-alpine
script:
- mvn clean verify
RW_de.bsvrz.buv.plugin.dobj-build-java-11:
interruptible: true
image:
maven:3.6.0-jdk-11
script:
- mvn clean verify
RW_de.bsvrz.buv.plugin.dobj-build-java-12:
interruptible: true
image:
maven:3.6.0-jdk-12
script:
- mvn clean verify
\ No newline at end of file
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......
......@@ -7,6 +7,11 @@
<author email="info@bitctrl.de">BitCtrl Systems GmbH</author>
</properties>
<body>
<release version="4.2.0" date="11.11.2019">
<action type="update">
[ÄM 136] BuV zusätzliche Verwaltungsschicht
</action>
</release>
<release version="4.1.0" date="13.06.2019">
<action type="update">
[ÄM 140] Fehlerbehandlung beim Laden von Darstellungen und Ansichten
......
copyrightText = Copyright (C) 2018 BitCtrl Systems GmbH \n\nThis program is free software; you can redistribute it and/or modify it under\nthe terms of the GNU General Public License as published by the Free Software\nFoundation; either version 3 of the License, or (at your option) any later\nversion.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\nFOR A PARTICULAR PURPOSE. See the GNU General Public License for more\ndetails.\n\nYou should have received a copy of the GNU General Public License along with\nthis program; if not, write to the Free Software Foundation, Inc., 51\nFranklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\nContact Information:\nBitCtrl Systems GmbH\nWei\u00DFenfelser Stra\u00DFe 67\n04229 Leipzig\nPhone: +49 341-490670\nmailto: info@bitctrl.de
copyrightText = Copyright (C) 2019 BitCtrl Systems GmbH \n\nThis program is free software; you can redistribute it and/or modify it under\nthe terms of the GNU General Public License as published by the Free Software\nFoundation; either version 3 of the License, or (at your option) any later\nversion.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\nFOR A PARTICULAR PURPOSE. See the GNU General Public License for more\ndetails.\n\nYou should have received a copy of the GNU General Public License along with\nthis program; if not, write to the Free Software Foundation, Inc., 51\nFranklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\nContact Information:\nBitCtrl Systems GmbH\nWei\u00DFenfelser Stra\u00DFe 67\n04229 Leipzig\nPhone: +49 341-490670\nmailto: info@bitctrl.de
descriptionText = Die Plug-ins Darstellungsobjekte implementieren die Objekte, die zur Darstellung der Zust\u00E4nde und Werte der Systemobjekte verwendet werden.
......
......@@ -2,7 +2,7 @@
<feature
id="de.bsvrz.buv.plugin.dobj.feature"
label="%featureName"
version="4.1.0.qualifier"
version="4.2.0.qualifier"
provider-name="%featureProvider"
plugin="de.bsvrz.buv.plugin.dobj">
......
copyrightText = Copyright (C) 2018 BitCtrl Systems GmbH \n\nThis program is free software; you can redistribute it and/or modify it under\nthe terms of the GNU General Public License as published by the Free Software\nFoundation; either version 3 of the License, or (at your option) any later\nversion.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\nFOR A PARTICULAR PURPOSE. See the GNU General Public License for more\ndetails.\n\nYou should have received a copy of the GNU General Public License along with\nthis program; if not, write to the Free Software Foundation, Inc., 51\nFranklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\nContact Information:\nBitCtrl Systems GmbH\nWei\u00DFenfelser Stra\u00DFe 67\n04229 Leipzig\nPhone: +49 341-490670\nmailto: info@bitctrl.de
copyrightText = Copyright (C) 2019 BitCtrl Systems GmbH \n\nThis program is free software; you can redistribute it and/or modify it under\nthe terms of the GNU General Public License as published by the Free Software\nFoundation; either version 3 of the License, or (at your option) any later\nversion.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT\nANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\nFOR A PARTICULAR PURPOSE. See the GNU General Public License for more\ndetails.\n\nYou should have received a copy of the GNU General Public License along with\nthis program; if not, write to the Free Software Foundation, Inc., 51\nFranklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\nContact Information:\nBitCtrl Systems GmbH\nWei\u00DFenfelser Stra\u00DFe 67\n04229 Leipzig\nPhone: +49 341-490670\nmailto: info@bitctrl.de
descriptionText = Enth\u00E4lt die (Java-)Quellen f\u00FCr das gleichnamige Feature.
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Darstellung Hilfe
Bundle-SymbolicName: de.bsvrz.buv.plugin.dobj.hilfe;singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-Vendor: BitCtrl Systems GmbH
Fragment-Host: de.bsvrz.buv.plugin.dobj;bundle-version="3.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
......
add_header=true
eclipse.preferences.version=1
header_text=/*\r\n * Rahmenwerk-Plug-in "Darstellungsobjekte"\r\n * Copyright (C) 2018 BitCtrl Systems GmbH\r\n *\r\n * This program is free software; you can redistribute it and/or modify it under\r\n * the terms of the GNU General Public License as published by the Free Software\r\n * Foundation; either version 3 of the License, or (at your option) any later\r\n * version.\r\n *\r\n * This program is distributed in the hope that it will be useful, but WITHOUT\r\n * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r\n * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\r\n * details.\r\n *\r\n * You should have received a copy of the GNU General Public License along with\r\n * this program; if not, write to the Free Software Foundation, Inc., 51\r\n * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Contact Information\:\r\n * BitCtrl Systems GmbH\r\n * Weissenfelser Strasse 67\r\n * 04229 Leipzig\r\n * Phone\: +49 341-490670\r\n * mailto\: info@bitctrl.de\r\n */
header_text=/*\r\n * Rahmenwerk-Plug-in "Darstellungsobjekte"\r\n * Copyright (C) 2019 BitCtrl Systems GmbH\r\n *\r\n * This program is free software; you can redistribute it and/or modify it under\r\n * the terms of the GNU General Public License as published by the Free Software\r\n * Foundation; either version 3 of the License, or (at your option) any later\r\n * version.\r\n *\r\n * This program is distributed in the hope that it will be useful, but WITHOUT\r\n * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r\n * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\r\n * details.\r\n *\r\n * You should have received a copy of the GNU General Public License along with\r\n * this program; if not, write to the Free Software Foundation, Inc., 51\r\n * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Contact Information\:\r\n * BitCtrl Systems GmbH\r\n * Weissenfelser Strasse 67\r\n * 04229 Leipzig\r\n * Phone\: +49 341-490670\r\n * mailto\: info@bitctrl.de\r\n */
project_specific_settings=true
replace_header=true
replacements=<?xml version\="1.0" standalone\="yes"?>\n\n<replacements>\n<replacement key\="get" scope\="1" mode\="0">Gets the</replacement>\n<replacement key\="set" scope\="1" mode\="0">Sets the</replacement>\n<replacement key\="add" scope\="1" mode\="0">Adds the</replacement>\n<replacement key\="edit" scope\="1" mode\="0">Edits the</replacement>\n<replacement key\="remove" scope\="1" mode\="0">Removes the</replacement>\n<replacement key\="init" scope\="1" mode\="0">Inits the</replacement>\n<replacement key\="parse" scope\="1" mode\="0">Parses the</replacement>\n<replacement key\="create" scope\="1" mode\="0">Creates the</replacement>\n<replacement key\="build" scope\="1" mode\="0">Builds the</replacement>\n<replacement key\="is" scope\="1" mode\="0">Checks if is</replacement>\n<replacement key\="print" scope\="1" mode\="0">Prints the</replacement>\n<replacement key\="has" scope\="1" mode\="0">Checks for</replacement>\n</replacements>\n\n
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=true
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_missing_override_annotations_interface_methods=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=true
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=true
cleanup.organize_imports=true
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_redundant_modifiers=true
cleanup.remove_redundant_semicolons=true
cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=false
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=false
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_anonymous_class_creation=false
cleanup.use_autoboxing=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=false
cleanup.use_this_for_non_static_field_access=false
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup.use_unboxing=false
cleanup_profile=_Eclipse [built-in]2
cleanup_settings_version=2
eclipse.preferences.version=1
jautodoc.cleanup.add_header=true
jautodoc.cleanup.replace_header=true
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: de.bsvrz.buv.plugin.dobj.rahmen.edit;singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: de.bsvrz.buv.plugin.dobj.rahmen.provider.RahmenEditPlugin$Implementation
Bundle-Vendor: %providerName
......
add_header=true
eclipse.preferences.version=1
header_text=/*\r\n * Rahmenwerk-Plug-in "Darstellungsobjekte"\r\n * Copyright (C) 2018 BitCtrl Systems GmbH\r\n *\r\n * This program is free software; you can redistribute it and/or modify it under\r\n * the terms of the GNU General Public License as published by the Free Software\r\n * Foundation; either version 3 of the License, or (at your option) any later\r\n * version.\r\n *\r\n * This program is distributed in the hope that it will be useful, but WITHOUT\r\n * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r\n * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\r\n * details.\r\n *\r\n * You should have received a copy of the GNU General Public License along with\r\n * this program; if not, write to the Free Software Foundation, Inc., 51\r\n * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Contact Information\:\r\n * BitCtrl Systems GmbH\r\n * Weissenfelser Strasse 67\r\n * 04229 Leipzig\r\n * Phone\: +49 341-490670\r\n * mailto\: info@bitctrl.de\r\n */
header_text=/*\r\n * Rahmenwerk-Plug-in "Darstellungsobjekte"\r\n * Copyright (C) 2019 BitCtrl Systems GmbH\r\n *\r\n * This program is free software; you can redistribute it and/or modify it under\r\n * the terms of the GNU General Public License as published by the Free Software\r\n * Foundation; either version 3 of the License, or (at your option) any later\r\n * version.\r\n *\r\n * This program is distributed in the hope that it will be useful, but WITHOUT\r\n * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r\n * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\r\n * details.\r\n *\r\n * You should have received a copy of the GNU General Public License along with\r\n * this program; if not, write to the Free Software Foundation, Inc., 51\r\n * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\r\n *\r\n * Contact Information\:\r\n * BitCtrl Systems GmbH\r\n * Weissenfelser Strasse 67\r\n * 04229 Leipzig\r\n * Phone\: +49 341-490670\r\n * mailto\: info@bitctrl.de\r\n */
multi_header=true
project_specific_settings=true
replace_header=true
......
......@@ -31,8 +31,10 @@ cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=tru
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_redundant_modifiers=true
cleanup.remove_redundant_semicolons=true
cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces=false
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
......@@ -46,6 +48,7 @@ cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_anonymous_class_creation=false
cleanup.use_autoboxing=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_lambda=true
......@@ -54,7 +57,8 @@ cleanup.use_this_for_non_static_field_access=false
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup_profile=_Eclipse [built-in]-default
cleanup.use_unboxing=false
cleanup_profile=_Eclipse [built-in]2
cleanup_settings_version=2
eclipse.preferences.version=1
jautodoc.cleanup.add_header=true
......
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: de.bsvrz.buv.plugin.dobj.rahmen;singleton:=true
Bundle-Version: 4.0.0.qualifier
Bundle-Version: 4.2.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: de.bsvrz.buv.plugin.dobj.rahmen.Activator
Bundle-Vendor: %providerName
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......@@ -29,6 +29,7 @@ package de.bsvrz.buv.plugin.dobj.rahmen.editpart;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.gef.CompoundSnapToHelper;
import org.eclipse.gef.EditPolicy;
......@@ -45,7 +46,6 @@ import com.bitctrl.lib.eclipse.emf.util.EmfUtil;
import de.bsvrz.buv.plugin.dobj.decorator.HintergrundfarbeMediator;
import de.bsvrz.buv.plugin.dobj.decorator.LinienstaerkeMediator;
import de.bsvrz.buv.plugin.dobj.decorator.LinienstaerkeZoomMediator;
import de.bsvrz.buv.plugin.dobj.decorator.SchriftMediator;
import de.bsvrz.buv.plugin.dobj.decorator.VordergrundfarbeMediator;
import de.bsvrz.buv.plugin.dobj.decorator.model.DobjDecoratorPackage;
......@@ -123,7 +123,11 @@ public class RahmenEditPart extends DoModelEditPart<RahmenDoModel, RahmenFigure>
new VordergrundfarbeMediator(this).mediate();
new SchriftMediator(this).mediate();
getFigure().setText(EmfUtil.getText(getModel()));
getFigure().setSize(getModel().getSize().getCopy());
if (getModel().getSize() != null) {
getFigure().setSize(getModel().getSize().getCopy());
} else {
getFigure().setSize(new Dimension(100, 100));
}
}
/**
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......@@ -124,8 +124,7 @@ public class RahmenFigure extends RectangleFigure implements LinienstaerkeFigure
}
/**
* @param text
* the text to set
* @param text the text to set
*/
public final void setText(String text) {
this.text = text;
......@@ -137,7 +136,7 @@ public class RahmenFigure extends RectangleFigure implements LinienstaerkeFigure
protected boolean useLocalCoordinates() {
return true;
}
@Override
public void setLinienstaerkeMaximum(final int maximaleLinienstaerke) {
this.maximaleLinienstaerke = maximaleLinienstaerke;
......@@ -161,8 +160,7 @@ public class RahmenFigure extends RectangleFigure implements LinienstaerkeFigure
}
@Override
public void setLinienstaerkeMaximaleZoomstufe(
final double maximaleZoomstufe) {
public void setLinienstaerkeMaximaleZoomstufe(final double maximaleZoomstufe) {
this.maximaleZoomstufe = maximaleZoomstufe;
repaint();
}
......@@ -173,8 +171,7 @@ public class RahmenFigure extends RectangleFigure implements LinienstaerkeFigure
}
@Override
public void setLinienstaerkeMinimaleZoomstufe(
final double minimaleZoomstufe) {
public void setLinienstaerkeMinimaleZoomstufe(final double minimaleZoomstufe) {
this.minimaleZoomstufe = minimaleZoomstufe;
repaint();
}
......
/*
* Rahmenwerk-Plug-in "Darstellungsobjekte"
* Copyright (C) 2018 BitCtrl Systems GmbH
* Copyright (C) 2019 BitCtrl Systems GmbH
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>de.bsvrz.buv</groupId>
<artifactId>de.bsvrz.buv.plugin.dobj.master</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>4.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
......
Supports Markdown
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