Commit a630cff8 authored by Jens Bendisposto's avatar Jens Bendisposto
Browse files

Merge branch 'release/2.3.0'

parents d6b1a47c 2d3b7d29
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: BMotion Studio Editor Plug-in
Bundle-SymbolicName: de.bmotionstudio.gef.editor;singleton:=true
Bundle-Version: 5.2.1
Bundle-Version: 5.3.0
Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
......@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jface.databinding;bundle-version="[1.2.1,2.0.0)",
org.eclipse.core.databinding.beans;bundle-version="[1.1.1,2.0.0)",
org.eclipse.gef;bundle-version="[3.7.0,4.0.0)",
de.prob.core;bundle-version="[9.1.0,9.2.0)",
org.eventb.core;bundle-version="[2.1.0,2.4.0)"
de.prob.core;bundle-version="[9.1.0,9.3.0)",
org.eventb.core;bundle-version="[2.1.0,2.5.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-BuddyPolicy: registered
......
......@@ -9,14 +9,12 @@ package de.bmotionstudio.gef.editor.model;
import org.eclipse.swt.graphics.RGB;
import de.bmotionstudio.gef.editor.AttributeConstants;
import de.bmotionstudio.gef.editor.attribute.BAttributeButtonGroup;
import de.bmotionstudio.gef.editor.attribute.BAttributeChecked;
import de.bmotionstudio.gef.editor.attribute.BAttributeEnabled;
import de.bmotionstudio.gef.editor.attribute.BAttributeFalseValue;
import de.bmotionstudio.gef.editor.attribute.BAttributeText;
import de.bmotionstudio.gef.editor.attribute.BAttributeTextColor;
import de.bmotionstudio.gef.editor.attribute.BAttributeTrueValue;
import de.bmotionstudio.gef.editor.attribute.BAttributeValue;
/**
* @author Lukas Ladenberger
......@@ -42,9 +40,7 @@ public class BCheckbox extends BControl {
initAttribute(new BAttributeText(DEFAULT_TEXT));
initAttribute(new BAttributeTextColor(new RGB(0, 0, 0)));
initAttribute(new BAttributeChecked(true));
initAttribute(new BAttributeValue(""));
initAttribute(new BAttributeEnabled(true));
initAttribute(new BAttributeButtonGroup(""));
initAttribute(new BAttributeTrueValue(""));
initAttribute(new BAttributeFalseValue(""));
getAttribute(AttributeConstants.ATTRIBUTE_HEIGHT).setValue(21);
......
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/keyboard.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/probcliparser.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/probcliparser.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin"/>
</classpath>
......@@ -2,10 +2,10 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ProB Animator Core
Bundle-SymbolicName: de.prob.core;singleton:=true
Bundle-Version: 9.1.2
Bundle-Version: 9.2.0
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.rodinp.core;bundle-version="[1.3.1,1.6.0)",
org.eventb.core;bundle-version="[2.1.0,2.4.0)"
org.eventb.core;bundle-version="[2.1.0,2.5.0)"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: HHU Düsseldorf STUPS Group
Export-Package: de.be4.classicalb.core.parser,
......
Revision: 8306
June 28 2011 - 2001
Revision: 9938
January 17 2012 - 2002
\ No newline at end of file
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
Revision: 9938
January 17 2012 - 1948
\ No newline at end of file
#!/bin/bash
PROBCOMMAND=probcli
INTERRUPT_COMMAND=send_user_interrupt
# Shell wrapper for PROBCOMMAND
echo "Running ProB Command-line Interface"
echo "$PROBCOMMAND" "$@"
# dirname
dirname=`dirname "$0"`
ulimit -d unlimited
chmod a+x "$dirname/$PROBCOMMAND"
chmod a+x "$dirname/$INTERRUPT_COMMAND"
exec "$dirname/$PROBCOMMAND" "$@"
Revision: 8306
June 28 2011 - 2002
Revision: 9938
January 17 2012 - 2002
\ No newline at end of file
No preview for this file type
Markdown is supported
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