Skip to content
Snippets Groups Projects
Commit 7e12b015 authored by Simon Barner's avatar Simon Barner
Browse files

Merge branch 'master' of https://git.fortiss.org/af3/kernel.git into

3470-timing_model

Conflicts:
	org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/extension/base/.ratings
	org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/internal/properties/.ratings


Signed-off-by: default avatarSimon Barner <barner@fortiss.org>
parents 12a19d99 54cab21b
No related branches found
No related tags found
1 merge request!393470 timing model
IdLabeledPropertySection.java dcfb39d225391c87f47e29f6d1ba1cb22a3d3fe4 GREEN
IdLabeledPropertySection.java 8a360874918ca84a319ae7668011a19cea574148 GREEN
NamedCommentedPropertySection.java d4fab618eca361f132b1baafecd66ad8f7919dfa YELLOW
PropertiesAdapterFactory.java edcf34766a60f21c9ba22a1ba73aa487c3d9a946 GREEN
......@@ -46,7 +46,7 @@ public class IdLabeledPropertySection extends PropertySectionBase {
super.createControls(parent, aTabbedPropertySheetPage);
idText = createFormText("ID");
idText.setEnabled(false);
idText.setEditable(false);
}
/** {@inheritDoc} */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment