Skip to content

Commit 4001b80

Browse files
NicoPeters.NPNicoPeters.NP
NicoPeters.NP
authored and
NicoPeters.NP
committed
merged trunk into prod (2839)
git-svn-id: http://oryx-editor.googlecode.com/svn/branches/prod@2840 d672c736-503d-0410-a38a-9366997c882b
1 parent df83520 commit 4001b80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1345
-1056
lines changed

‎build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
deploymentdir = /var/lib/tomcat5.5/webapps
1+
deploymentdir = C:/Programme/Tomcat6/webapps
22
java-debug = on
33
postgresql-hostname = localhost
44
postgresql-username = poem

‎buildApps/lib/yuicompressor-2.4.2.jar

831 KB
Binary file not shown.

‎editor/client/scripts/Core/StencilSet/rules.js

+12
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@ ORYX.Core.StencilSet.Rules = {
258258
if (!morphr[morphrKey]) {
259259
morphr[morphrKey] = [];
260260
}
261+
if(!rules.preserveBounds) {
262+
rules.preserveBounds = false;
263+
}
261264
rules.baseMorphs.each((function(baseMorphStencilId){
262265
morphr[morphrKey].push(this._getStencilById(namespace + baseMorphStencilId));
263266
}).bind(this));
@@ -1051,6 +1054,15 @@ ORYX.Core.StencilSet.Rules = {
10511054
});
10521055
},
10531056

1057+
preserveBounds: function(stencil) {
1058+
return this._stencilSets.any(function(ss) {
1059+
return ss.jsonRules().morphingRules.any(function(r) {
1060+
return stencil.roles().include(ss.namespace() + r.role)
1061+
&& r.preserveBounds && r.preserveBounds !== false;
1062+
})
1063+
})
1064+
},
1065+
10541066
/** End morphing rules' methods */
10551067

10561068

‎editor/client/scripts/Core/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/client/scripts/Plugins/bpmnplus2bpel4chor.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/client/scripts/Plugins/bpmnplusLayout.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright (c) 2009
3-
* Oliver Kopp, Sven Wagner-Boysen
3+
* Kerstin Pfitzner, Oliver Kopp, Sven Wagner-Boysen
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a
66
* copy of this software and associated documentation files (the "Software"),

‎editor/client/scripts/Plugins/bpmnplusSerialization.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* Copyright (c) 2008-2009
3-
* Oliver Kopp, Sven Wagner-Boysen
3+
* Kerstin Pfitzner, Oliver Kopp, Sven Wagner-Boysen
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a
66
* copy of this software and associated documentation files (the "Software"),
@@ -88,7 +88,7 @@ ORYX.Plugins.BPMNPlusSerialization = {
8888
* The handler to serialize a bpmnplus variable
8989
*
9090
* @param {Object} event
91-
* The serilization event to handle
91+
* The serialization event to handle
9292
*/
9393
handleSerializeVariable: function(event) {
9494
var shape = event.shape;
@@ -173,7 +173,7 @@ ORYX.Plugins.BPMNPlusSerialization = {
173173
* The handle to serialize any kind of data object
174174
*
175175
* @param {Object} event
176-
* The serilization event
176+
* The serialization event
177177
*/
178178
handleSerializeDataObject : function(event) {
179179
var shape = event.shape;

‎editor/client/scripts/Plugins/shapemenu.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎editor/data/i18n/translation_de.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ ORYX.I18N.Arrangement.bbDesc = "Eine Ebene nach Hinten";
9393
ORYX.I18N.Arrangement.groupA = "Alignment";
9494
ORYX.I18N.Arrangement.ab = "Unten ausrichten";
9595
ORYX.I18N.Arrangement.abDesc = "Unten ausrichten";
96-
ORYX.I18N.Arrangement.am = "Horizontal mittig ausrichten";
97-
ORYX.I18N.Arrangement.amDesc = "Horizontal mittig ausrichten";
96+
ORYX.I18N.Arrangement.am = "Horizontal ausrichten";
97+
ORYX.I18N.Arrangement.amDesc = "Horizontal ausrichten";
9898
ORYX.I18N.Arrangement.at = "Oben ausrichten";
9999
ORYX.I18N.Arrangement.atDesc = "Oben ausrichten";
100100
ORYX.I18N.Arrangement.al = "Links ausrichten";
101101
ORYX.I18N.Arrangement.alDesc = "Links ausrichten";
102-
ORYX.I18N.Arrangement.ac = "Vertikal mittig ausrichten";
103-
ORYX.I18N.Arrangement.acDesc = "Vertikal mittig ausrichten";
102+
ORYX.I18N.Arrangement.ac = "Vertikal ausrichten";
103+
ORYX.I18N.Arrangement.acDesc = "Vertikal ausrichten";
104104
ORYX.I18N.Arrangement.ar = "Rechts ausrichten";
105105
ORYX.I18N.Arrangement.arDesc = "Rechts ausrichten";
106106
ORYX.I18N.Arrangement.as = "Größenangleichung";
@@ -154,7 +154,7 @@ ORYX.I18N.BPEL4ChorSupport.impFailed = "Während des Importierens ist ein Fehler
154154

155155
if(!ORYX.I18N.Bpel4ChorTransformation) ORYX.I18N.Bpel4ChorTransformation = {};
156156

157-
ORYX.I18N.Bpel4ChorTransformation.group = "BPEL4Chor";
157+
ORYX.I18N.Bpel4ChorTransformation.group = "Export";
158158
ORYX.I18N.Bpel4ChorTransformation.exportBPEL = "BPEL4Chor Export";
159159
ORYX.I18N.Bpel4ChorTransformation.exportBPELDesc = "Exportieren nach BPEL4Chor";
160160
ORYX.I18N.Bpel4ChorTransformation.exportXPDL = "XPDL4Chor Export";

‎editor/data/i18n/translation_en_us.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ ORYX.I18N.BPEL4ChorSupport.impFailed = "An error while importing occurs! <br/>Pl
156156

157157
if(!ORYX.I18N.Bpel4ChorTransformation) ORYX.I18N.Bpel4ChorTransformation = {};
158158

159-
ORYX.I18N.Bpel4ChorTransformation.group = "BPEL4Chor";
159+
ORYX.I18N.Bpel4ChorTransformation.group = "Export";
160160
ORYX.I18N.Bpel4ChorTransformation.exportBPEL = "Export BPEL4Chor";
161161
ORYX.I18N.Bpel4ChorTransformation.exportBPELDesc = "Export diagram to BPEL4Chor";
162162
ORYX.I18N.Bpel4ChorTransformation.exportXPDL = "Export XPDL4Chor";

‎editor/data/stencilsets/bpel/bpel.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"title_de":"WS-BPEL-Prozess",
44
"namespace":"http://b3mn.org/stencilset/bpel#",
55
"description":"The stencil set for a WS-BPEL 2.0 Process",
6-
"description_de":"Schablonen für WS-BPEL-2.0-Prozesse",
6+
"description_de":"Schablonen für einen WS-BPEL-2.0-Prozess",
77
"stencils" : [
88
{
99
"type":"node",

‎editor/data/stencilsets/bpel4chor/bpel4chor.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"title":"BPEL4Chor",
33
"title_de":"BPEL4Chor",
44
"namespace":"http://b3mn.org/stencilset/bpel4chor#",
5-
"description":"The stencil set for a Bpel4Chor Process",
6-
"description_de":"Schablonen für Bpel4Chor-Prozesse",
5+
"description":"The stencil set for a BPEL4Chor Choreography",
6+
"description_de":"Schablonen für eine BPEL4Chor-Choreographiebeschreibung",
77
"stencils" : [
88
{
99
"type":"node",

0 commit comments

Comments
 (0)