Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 402895
Collapse All | Expand All

(-)plugin.gen.xml (-12 / +81 lines)
Lines 113-134 Link Here
113
			"3009" = PACKAGE_CN
113
			"3009" = PACKAGE_CN
114
			"2012" = COMMENT
114
			"2012" = COMMENT
115
			"3028" = COMMENT_CN
115
			"3028" = COMMENT_CN
116
			"2011" = CONSTRAINT
117
			"3029" = CONSTRAINT_CN
118
			"2005" = MODEL
116
		  -->
119
		  -->
117
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2012, 3028"/>
120
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2012, 3028, 2011, 3029, 2005"/>
118
		
121
		
119
		<!-- 
122
		<!-- 
120
			"4008" = DEPENDENCY
123
			"4008" = DEPENDENCY
121
			"4010" = PACKAGE_IMPORT
124
			"4010" = PACKAGE_IMPORT
122
			"4013" = COMMENT_ANNOTATED_ELEMENT
125
			"4013" = COMMENT_ANNOTATED_ELEMENT
126
			"4006" = ABSTRACTION
123
		  -->
127
		  -->
124
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013"/>
128
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013, 4006"/>
125
		
129
		
126
		<object id="elementtype.node"
130
		<object id="elementtype.node"
127
	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
131
	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
128
	       
132
	       
129
	     <method
133
	     <method
130
	        name="getSemanticHint()"
134
	        name="getSemanticHint()"
131
			value="2007, 3009, 2012, 3028">
135
			value="2007, 3009, 2012, 3028, 2011, 3029, 2005">
132
		</method>
136
		</method>
133
		</object>
137
		</object>
134
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
138
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
Lines 138-144 Link Here
138
	       
142
	       
139
	     <method
143
	     <method
140
	        name="getSemanticHint()"
144
	        name="getSemanticHint()"
141
			value="4008, 4010, 4013">
145
			value="4008, 4010, 4013, 4006">
142
		</method>
146
		</method>
143
		</object>
147
		</object>
144
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
148
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
Lines 156-161 Link Here
156
			<method name="getProxyClassID()" value="uml.Comment"/>
160
			<method name="getProxyClassID()" value="uml.Comment"/>
157
		</object>
161
		</object>
158
		
162
		
163
		<!-- "uml.Constraint" -->
164
		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
165
			<method name="getProxyClassID()" value="uml.Constraint"/>
166
		</object>
167
		
168
		<!-- "uml.Model" -->
169
		<object id="uml.Model" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
170
			<method name="getProxyClassID()" value="uml.Model"/>
171
		</object>
172
		
159
		<!-- "uml.Dependency" -->
173
		<!-- "uml.Dependency" -->
160
		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
174
		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
161
			<method name="getProxyClassID()" value="uml.Dependency"/>
175
			<method name="getProxyClassID()" value="uml.Dependency"/>
Lines 166-178 Link Here
166
			<method name="getProxyClassID()" value="uml.PackageImport"/>
180
			<method name="getProxyClassID()" value="uml.PackageImport"/>
167
		</object>
181
		</object>
168
		
182
		
183
		<!-- "uml.Abstraction" -->
184
		<object id="uml.Abstraction" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
185
			<method name="getProxyClassID()" value="uml.Abstraction"/>
186
		</object>
187
		
169
		<!-- Additional activation contexts for nodes semantic objects -->
188
		<!-- Additional activation contexts for nodes semantic objects -->
170
		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
189
		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
171
			elements="uml.Package, uml.Comment"/>
190
			elements="uml.Package, uml.Comment, uml.Constraint, uml.Model"/>
172
		
191
		
173
		<!-- Additional activation contexts for edges semantic objects -->
192
		<!-- Additional activation contexts for edges semantic objects -->
174
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
193
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
175
			elements="uml.Dependency, uml.PackageImport"/>
194
			elements="uml.Dependency, uml.PackageImport, uml.Abstraction"/>
176
			
195
			
177
	</viewProvider>	
196
	</viewProvider>	
178
</extension>
197
</extension>
Lines 207-212 Link Here
207
			"5038" = COMMENT_LABEL_BODY_HINT
226
			"5038" = COMMENT_LABEL_BODY_HINT
208
			"3028" = COMMENT_CN
227
			"3028" = COMMENT_CN
209
			"5063" = COMMENT_CN_LABEL_BODY_HINT
228
			"5063" = COMMENT_CN_LABEL_BODY_HINT
229
			"2011" = CONSTRAINT
230
			"5037" = CONSTRAINT_LABEL_NAME_HINT
231
			"5159" = CONSTRAINT_LABEL_BODY_HINT
232
			"3029" = CONSTRAINT_CN
233
			"5064" = CONSTRAINT_CN_LABEL_NAME_HINT
234
			"5160" = CONSTRAINT_CN_LABEL_BODY_HINT
235
			"2005" = MODEL
236
			"5020" = MODEL_LABEL_NAME_TN_HINT
237
			"7009" = MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
210
		  -->
238
		  -->
211
		<object
239
		<object
212
			id="PACKAGE"
240
			id="PACKAGE"
Lines 228-233 Link Here
228
			class="org.eclipse.gmf.runtime.notation.Node">
256
			class="org.eclipse.gmf.runtime.notation.Node">
229
			<method name="getType()" value="3028, 5063"/>
257
			<method name="getType()" value="3028, 5063"/>
230
		</object>
258
		</object>
259
		<object
260
			id="CONSTRAINT"
261
			class="org.eclipse.gmf.runtime.notation.Node">
262
			<method name="getType()" value="2011, 5037, 5159"/>
263
		</object>
264
		<object
265
			id="CONSTRAINT_CN"
266
			class="org.eclipse.gmf.runtime.notation.Node">
267
			<method name="getType()" value="3029, 5064, 5160"/>
268
		</object>
269
		<object
270
			id="MODEL"
271
			class="org.eclipse.gmf.runtime.notation.Node">
272
			<method name="getType()" value="2005, 5020, 7009"/>
273
		</object>
231
		
274
		
232
		
275
		
233
		<!-- 	
276
		<!-- 	
Lines 237-242 Link Here
237
			"4010" = PACKAGE_IMPORT
280
			"4010" = PACKAGE_IMPORT
238
			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
281
			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
239
			"4013" = COMMENT_ANNOTATED_ELEMENT
282
			"4013" = COMMENT_ANNOTATED_ELEMENT
283
			"4006" = ABSTRACTION
284
			"6014" = ABSTRACTION_LABEL_NAME_HINT
285
			"6015" = ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT
240
		  -->
286
		  -->
241
		<object
287
		<object
242
			id="DEPENDENCY"
288
			id="DEPENDENCY"
Lines 253-261 Link Here
253
			class="org.eclipse.gmf.runtime.notation.Edge">
299
			class="org.eclipse.gmf.runtime.notation.Edge">
254
			<method name="getType()" value="4013"/>
300
			<method name="getType()" value="4013"/>
255
		</object>
301
		</object>
302
		<object
303
			id="ABSTRACTION"
304
			class="org.eclipse.gmf.runtime.notation.Edge">
305
			<method name="getType()" value="4006, 6014, 6015"/>
306
		</object>
256
		
307
		
257
		<context views="PACKAGE, PACKAGE_CN, COMMENT, COMMENT_CN"/>
308
		<context views="PACKAGE, PACKAGE_CN, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN, MODEL"/>
258
		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT"/>
309
		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, ABSTRACTION"/>
259
		
310
		
260
	</editpartProvider>
311
	</editpartProvider>
261
</extension>
312
</extension>
Lines 282-288 Link Here
282
333
283
	<!-- Element Preference pages declaration -->
334
	<!-- Element Preference pages declaration -->
284
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
335
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
285
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
336
		class="org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage"
286
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
337
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
287
		name="Package">
338
		name="Package">
288
	</page>
339
	</page>
Lines 300-305 Link Here
300
	
351
	
301
	
352
	
302
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
353
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
354
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.ConstraintPreferencePage"
355
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.ConstraintPreferencePage"
356
		name="Constraint">
357
	</page>
358
	
359
	
360
	
361
	
362
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
363
		class="org.eclipse.papyrus.uml.diagram.pkg.CustomModelPreferencePage"
364
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage"
365
		name="Model">
366
	</page>
367
	
368
	
369
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
303
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
370
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
304
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
371
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
305
		name="Dependency">
372
		name="Dependency">
Lines 313-322 Link Here
313
	</page>
380
	</page>
314
	
381
	
315
	
382
	
383
	
384
	
316
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
385
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
317
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentLinkPreferencePage"
386
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.AbstractionPreferencePage"
318
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentLinkPreferencePage"
387
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.AbstractionPreferencePage"
319
		name="CommentLink">
388
		name="Abstraction">
320
	</page>
389
	</page>
321
	
390
	
322
	
391
	
(-)plugin.properties (-1 / +1 lines)
Lines 8-12 Link Here
8
# Contributors:
8
# Contributors:
9
#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
9
#     Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - initial API and implementation
10
##################################################################################
10
##################################################################################
11
pluginName=UML Package Diagram (Incubation)
11
pluginName=UML Package Diagram
12
providerName=Eclipse Modeling Project
12
providerName=Eclipse Modeling Project
(-)plugin.xml (-12 / +134 lines)
Lines 113-134 Link Here
113
			"3009" = PACKAGE_CN
113
			"3009" = PACKAGE_CN
114
			"2012" = COMMENT
114
			"2012" = COMMENT
115
			"3028" = COMMENT_CN
115
			"3028" = COMMENT_CN
116
			"2011" = CONSTRAINT
117
			"3029" = CONSTRAINT_CN
118
			"2005" = MODEL
116
		  -->
119
		  -->
117
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2012, 3028"/>
120
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="2007, 3009, 2012, 3028, 2011, 3029, 2005"/>
118
		
121
		
119
		<!-- 
122
		<!-- 
120
			"4008" = DEPENDENCY
123
			"4008" = DEPENDENCY
121
			"4010" = PACKAGE_IMPORT
124
			"4010" = PACKAGE_IMPORT
122
			"4013" = COMMENT_ANNOTATED_ELEMENT
125
			"4013" = COMMENT_ANNOTATED_ELEMENT
126
			"4006" = ABSTRACTION
123
		  -->
127
		  -->
124
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013"/>
128
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="4008, 4010, 4013, 4006"/>
125
		
129
		
126
		<object id="elementtype.node"
130
		<object id="elementtype.node"
127
	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
131
	        class="org.eclipse.papyrus.gmf.diagram.common.commands.ISemanticHintAdapter(org.eclipse.papyrus.sysml.diagram.common)">
128
	       
132
	       
129
	     <method
133
	     <method
130
	        name="getSemanticHint()"
134
	        name="getSemanticHint()"
131
			value="2007, 3009, 2012, 3028">
135
			value="2007, 3009, 2012, 3028, 2011, 3029, 2005">
132
		</method>
136
		</method>
133
		</object>
137
		</object>
134
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
138
		<context viewClass="org.eclipse.gmf.runtime.notation.Node" elements="elementtype.node"/>
Lines 138-144 Link Here
138
	       
142
	       
139
	     <method
143
	     <method
140
	        name="getSemanticHint()"
144
	        name="getSemanticHint()"
141
			value="4008, 4010, 4013">
145
			value="4008, 4010, 4013, 4006">
142
		</method>
146
		</method>
143
		</object>
147
		</object>
144
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
148
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge" elements="elementtype.edge"/>
Lines 156-161 Link Here
156
			<method name="getProxyClassID()" value="uml.Comment"/>
160
			<method name="getProxyClassID()" value="uml.Comment"/>
157
		</object>
161
		</object>
158
		
162
		
163
		<!-- "uml.Constraint" -->
164
		<object id="uml.Constraint" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
165
			<method name="getProxyClassID()" value="uml.Constraint"/>
166
		</object>
167
		
168
		<!-- "uml.Model" -->
169
		<object id="uml.Model" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
170
			<method name="getProxyClassID()" value="uml.Model"/>
171
		</object>
172
		
159
		<!-- "uml.Dependency" -->
173
		<!-- "uml.Dependency" -->
160
		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
174
		<object id="uml.Dependency" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
161
			<method name="getProxyClassID()" value="uml.Dependency"/>
175
			<method name="getProxyClassID()" value="uml.Dependency"/>
Lines 166-178 Link Here
166
			<method name="getProxyClassID()" value="uml.PackageImport"/>
180
			<method name="getProxyClassID()" value="uml.PackageImport"/>
167
		</object>
181
		</object>
168
		
182
		
183
		<!-- "uml.Abstraction" -->
184
		<object id="uml.Abstraction" class="org.eclipse.gmf.runtime.emf.core.util.IProxyEObject(org.eclipse.gmf.runtime.emf.core)">
185
			<method name="getProxyClassID()" value="uml.Abstraction"/>
186
		</object>
187
		
169
		<!-- Additional activation contexts for nodes semantic objects -->
188
		<!-- Additional activation contexts for nodes semantic objects -->
170
		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
189
		<context viewClass="org.eclipse.gmf.runtime.notation.Node"
171
			elements="uml.Package, uml.Comment"/>
190
			elements="uml.Package, uml.Comment, uml.Constraint, uml.Model"/>
172
		
191
		
173
		<!-- Additional activation contexts for edges semantic objects -->
192
		<!-- Additional activation contexts for edges semantic objects -->
174
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
193
		<context viewClass="org.eclipse.gmf.runtime.notation.Edge"
175
			elements="uml.Dependency, uml.PackageImport"/>
194
			elements="uml.Dependency, uml.PackageImport, uml.Abstraction"/>
176
			
195
			
177
	</viewProvider>	
196
	</viewProvider>	
178
</extension>
197
</extension>
Lines 207-212 Link Here
207
			"5038" = COMMENT_LABEL_BODY_HINT
226
			"5038" = COMMENT_LABEL_BODY_HINT
208
			"3028" = COMMENT_CN
227
			"3028" = COMMENT_CN
209
			"5063" = COMMENT_CN_LABEL_BODY_HINT
228
			"5063" = COMMENT_CN_LABEL_BODY_HINT
229
			"2011" = CONSTRAINT
230
			"5037" = CONSTRAINT_LABEL_NAME_HINT
231
			"5159" = CONSTRAINT_LABEL_BODY_HINT
232
			"3029" = CONSTRAINT_CN
233
			"5064" = CONSTRAINT_CN_LABEL_NAME_HINT
234
			"5160" = CONSTRAINT_CN_LABEL_BODY_HINT
235
			"2005" = MODEL
236
			"5020" = MODEL_LABEL_NAME_TN_HINT
237
			"7009" = MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT
210
		  -->
238
		  -->
211
		<object
239
		<object
212
			id="PACKAGE"
240
			id="PACKAGE"
Lines 228-233 Link Here
228
			class="org.eclipse.gmf.runtime.notation.Node">
256
			class="org.eclipse.gmf.runtime.notation.Node">
229
			<method name="getType()" value="3028, 5063"/>
257
			<method name="getType()" value="3028, 5063"/>
230
		</object>
258
		</object>
259
		<object
260
			id="CONSTRAINT"
261
			class="org.eclipse.gmf.runtime.notation.Node">
262
			<method name="getType()" value="2011, 5037, 5159"/>
263
		</object>
264
		<object
265
			id="CONSTRAINT_CN"
266
			class="org.eclipse.gmf.runtime.notation.Node">
267
			<method name="getType()" value="3029, 5064, 5160"/>
268
		</object>
269
		<object
270
			id="MODEL"
271
			class="org.eclipse.gmf.runtime.notation.Node">
272
			<method name="getType()" value="2005, 5020, 7009"/>
273
		</object>
231
		
274
		
232
		
275
		
233
		<!-- 	
276
		<!-- 	
Lines 237-242 Link Here
237
			"4010" = PACKAGE_IMPORT
280
			"4010" = PACKAGE_IMPORT
238
			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
281
			"6022" = PACKAGE_IMPORT_LABEL_APPLIED_STEREOTYPE_HINT
239
			"4013" = COMMENT_ANNOTATED_ELEMENT
282
			"4013" = COMMENT_ANNOTATED_ELEMENT
283
			"4006" = ABSTRACTION
284
			"6014" = ABSTRACTION_LABEL_NAME_HINT
285
			"6015" = ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT
240
		  -->
286
		  -->
241
		<object
287
		<object
242
			id="DEPENDENCY"
288
			id="DEPENDENCY"
Lines 253-261 Link Here
253
			class="org.eclipse.gmf.runtime.notation.Edge">
299
			class="org.eclipse.gmf.runtime.notation.Edge">
254
			<method name="getType()" value="4013"/>
300
			<method name="getType()" value="4013"/>
255
		</object>
301
		</object>
302
		<object
303
			id="ABSTRACTION"
304
			class="org.eclipse.gmf.runtime.notation.Edge">
305
			<method name="getType()" value="4006, 6014, 6015"/>
306
		</object>
256
		
307
		
257
		<context views="PACKAGE, PACKAGE_CN, COMMENT, COMMENT_CN"/>
308
		<context views="PACKAGE, PACKAGE_CN, COMMENT, COMMENT_CN, CONSTRAINT, CONSTRAINT_CN, MODEL"/>
258
		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT"/>
309
		<context views="DEPENDENCY, PACKAGE_IMPORT, COMMENT_ANNOTATED_ELEMENT, ABSTRACTION"/>
259
		
310
		
260
	</editpartProvider>
311
	</editpartProvider>
261
</extension>
312
</extension>
Lines 282-288 Link Here
282
333
283
	<!-- Element Preference pages declaration -->
334
	<!-- Element Preference pages declaration -->
284
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
335
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
285
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
336
		class="org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage"
286
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
337
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage"
287
		name="Package">
338
		name="Package">
288
	</page>
339
	</page>
Lines 300-305 Link Here
300
	
351
	
301
	
352
	
302
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
353
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
354
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.ConstraintPreferencePage"
355
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.ConstraintPreferencePage"
356
		name="Constraint">
357
	</page>
358
	
359
	
360
	
361
	
362
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
363
		class="org.eclipse.papyrus.uml.diagram.pkg.CustomModelPreferencePage"
364
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage"
365
		name="Model">
366
	</page>
367
	
368
	
369
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
303
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
370
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
304
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
371
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage"
305
		name="Dependency">
372
		name="Dependency">
Lines 313-327 Link Here
313
	</page>
380
	</page>
314
	
381
	
315
	
382
	
383
	
384
	
316
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
385
	<page  	category="org.eclipse.papyrus.uml.diagram.pkg.preferences"
317
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentLinkPreferencePage"
386
		class="org.eclipse.papyrus.uml.diagram.pkg.preferences.AbstractionPreferencePage"
318
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentLinkPreferencePage"
387
		id="org.eclipse.papyrus.uml.diagram.pkg.preferences.AbstractionPreferencePage"
319
		name="CommentLink">
388
		name="Abstraction">
320
	</page>
389
	</page>
321
	
390
	
322
	
391
	
323
392
324
</extension>
393
</extension>
394
<extension
395
      id="ep-provider"
396
      point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders">
397
   <editpartProvider
398
         class="org.eclipse.papyrus.uml.diagram.pkg.provider.CPackageEditPartProvider">
399
      <Priority
400
            name="High">
401
      </Priority>
402
      <object
403
            class="org.eclipse.gmf.runtime.notation.Diagram"
404
            id="generated-diagram">
405
         <method
406
               name="getType()"
407
               value="Package">
408
         </method>
409
      </object>
410
      <object
411
            class="org.eclipse.gmf.runtime.notation.Node"
412
            id="generated-nodes">
413
         <method
414
               name="getType()"
415
               value="2014,2013,2015,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2016,3002,3003,3004,3015,3031,3016,3005,3006,3007,3008,3020,3021,3022,3023,3024,3025,3017,3009,3010,3011,3012,3013,3014,3026,3027,3018,3019,3028,3029,3030">
416
         </method>
417
      </object>
418
      <object
419
            class="org.eclipse.gmf.runtime.notation.Edge"
420
            id="generated-links">
421
         <method
422
               name="getType()"
423
               value="4016,4017,4001,4019,4002,4003,4004,4005,4006,4007,4008,4018,4009,4010,4011,4012,4013,4014,4015,4020,4021">
424
         </method>
425
      </object>
426
      <object
427
            class="org.eclipse.gmf.runtime.notation.Node"
428
            id="generated-labels">
429
         <method
430
               name="getType()"
431
               value="5066,5002,5005,5008,5011,5020,5023,5026,5029,5032,5035,5037,5038,0,5040,5043,5046,5049,5052,5055,5017,5014,5058,5061,5063,5064">
432
         </method>
433
      </object>
434
      <object
435
            class="org.eclipse.gmf.runtime.notation.Node"
436
            id="generated-compartments">
437
         <method
438
               name="getType()"
439
               value="7034,7001,7002,7003,7004,7014,7005,7006,7007,7008,7009,7023,7024,7025,7026,7027,7028,7029,7030,7031,7010,7011,7012,7013,7032,7033,7015,7016,7017,7018,7019,7020,7021,7035">
440
         </method>
441
      </object>
442
      <context
443
            views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments">
444
      </context>
445
   </editpartProvider>
446
</extension>
325
447
326
<!-- // Start of user code custom extensions 
448
<!-- // Start of user code custom extensions 
327
  -->
449
  -->
(-)model/UML.Package.idgen (-3 / +15 lines)
Lines 8-17 Link Here
8
  </diagramEditPart>
8
  </diagramEditPart>
9
  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">
9
  <inheritedDiagrams name="ClassDiagram" viewProviderClassQualifiedName="" editPartProviderClassQualifiedName="" dndEditPolicyClassQualifiedName="org.eclipse.papyrus.uml.diagram.clazz.custom.policies.ClassDiagramDragDropEditPolicy">
10
    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>
10
    <genInheritedEditor href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#PapyrusUMLClassDiagram"/>
11
    <genNodes>
11
    <genNodes customPreferencePage="org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage">
12
      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>
12
      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.9"/>
13
    </genNodes>
13
    </genNodes>
14
    <genNodes generatePreferencePage="false" generateTool="false">
14
    <genNodes customPreferencePage="org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage" generatePreferencePage="false" generateTool="false">
15
      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.31"/>
15
      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.31"/>
16
    </genNodes>
16
    </genNodes>
17
    <genNodes name="">
17
    <genNodes name="">
Lines 20-34 Link Here
20
    <genNodes generatePreferencePage="false" generateTool="false">
20
    <genNodes generatePreferencePage="false" generateTool="false">
21
      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.36"/>
21
      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.36"/>
22
    </genNodes>
22
    </genNodes>
23
    <genNodes>
24
      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.14"/>
25
    </genNodes>
26
    <genNodes generatePreferencePage="false" generateTool="false">
27
      <genNode xsi:type="gmfgen:GenChildNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@childNodes.37"/>
28
    </genNodes>
29
    <genNodes customPreferencePage="org.eclipse.papyrus.uml.diagram.pkg.CustomModelPreferencePage">
30
      <genNode xsi:type="gmfgen:GenTopLevelNode" href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@topLevelNodes.7"/>
31
    </genNodes>
23
    <genLinks>
32
    <genLinks>
24
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.10"/>
33
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.10"/>
25
    </genLinks>
34
    </genLinks>
26
    <genLinks>
35
    <genLinks>
27
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>
36
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.13"/>
28
    </genLinks>
37
    </genLinks>
29
    <genLinks name="CommentLink">
38
    <genLinks name="CommentLink" customPreferencePage="" generatePreferencePage="false" generateTool="false">
30
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>
39
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.16"/>
31
    </genLinks>
40
    </genLinks>
41
    <genLinks>
42
      <genLink href="../../org.eclipse.papyrus.uml.diagram.clazz/model/classdiagram.gmfgen#/0/@diagram/@links.8"/>
43
    </genLinks>
32
  </inheritedDiagrams>
44
  </inheritedDiagrams>
33
  <customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.uml.diagram.pkg.provider.CustomEditPolicyProvider"/>
45
  <customJavaClasses customEditPolicyProvider="org.eclipse.papyrus.uml.diagram.pkg.provider.CustomEditPolicyProvider"/>
34
</idgen:Diagram>
46
</idgen:Diagram>
(-)palettes/package.palette.gen.xml (-2 / +8 lines)
Lines 7-17 Link Here
7
			<aspectTool description="Create a new Comment" id="package.tool.comment"
7
			<aspectTool description="Create a new Comment" id="package.tool.comment"
8
				name="Comment" refToolId="clazz.tool.comment">
8
				name="Comment" refToolId="clazz.tool.comment">
9
			</aspectTool>
9
			</aspectTool>
10
			<aspectTool description="Create a new Constraint" id="package.tool.constraint"
11
				name="Constraint" refToolId="clazz.tool.constraint">
12
			</aspectTool>
13
			<aspectTool description="Create a new Model" id="package.tool.model"
14
				name="Model" refToolId="clazz.tool.model">
15
			</aspectTool>
10
			<aspectTool description="Create a new Package" id="package.tool.package"
16
			<aspectTool description="Create a new Package" id="package.tool.package"
11
				name="Package" refToolId="clazz.tool.package">
17
				name="Package" refToolId="clazz.tool.package">
12
			</aspectTool>
18
			</aspectTool>
13
			<aspectTool description="Create a new CommentLink" id="package.tool.commentlink"
19
			<aspectTool description="Create a new Abstraction" id="package.tool.abstraction"
14
				name="CommentLink" refToolId="clazz.tool.link">
20
				name="Abstraction" refToolId="clazz.tool.abstraction">
15
			</aspectTool>
21
			</aspectTool>
16
			<aspectTool description="Create a new Dependency" id="package.tool.dependency"
22
			<aspectTool description="Create a new Dependency" id="package.tool.dependency"
17
				name="Dependency" refToolId="clazz.tool.dependency">
23
				name="Dependency" refToolId="clazz.tool.dependency">
(-)palettes/package.palette.xml (-5 / +17 lines)
Lines 1-14 Link Here
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
1
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
<paletteDefinition>
2
<paletteDefinition>
3
	<content>
3
	<content>
4
		<drawer
4
	<drawer
5
			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
5
			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
6
			id="org.eclipse.papyrus.uml.diagram.pkg.UML_Package__Tools" name="Tools">
6
			id="org.eclipse.papyrus.uml.diagram.pkg.UML_Package__Tools" name="Tools">
7
			<aspectTool description="Create a new Comment" id="package.tool.comment"
8
				name="Comment" refToolId="clazz.tool.comment">
9
			</aspectTool>
10
			<aspectTool description="Create a new Constraint" id="package.tool.constraint"
11
				name="Constraint" refToolId="clazz.tool.constraint">
12
			</aspectTool>
13
			<aspectTool description="Create a new Model" id="package.tool.model"
14
				name="Model" refToolId="clazz.tool.model">
15
			</aspectTool>
7
			<aspectTool description="Create a new Package" id="package.tool.package"
16
			<aspectTool description="Create a new Package" id="package.tool.package"
8
				name="Package" refToolId="clazz.tool.package">
17
				name="Package" refToolId="clazz.tool.package">
9
			</aspectTool>
18
			</aspectTool>
10
			<aspectTool description="Create a new Comment" id="package.tool.comment"
19
			<aspectTool description="Create a new Abstraction" id="package.tool.abstraction"
11
				name="Comment" refToolId="clazz.tool.comment">
20
				name="Abstraction" refToolId="clazz.tool.abstraction">
12
			</aspectTool>
21
			</aspectTool>
13
			<aspectTool description="Create a new Dependency" id="package.tool.dependency"
22
			<aspectTool description="Create a new Dependency" id="package.tool.dependency"
14
				name="Dependency" refToolId="clazz.tool.dependency">
23
				name="Dependency" refToolId="clazz.tool.dependency">
Lines 16-25 Link Here
16
			<aspectTool description="Create a new PackageImport" id="package.tool.packageimport"
25
			<aspectTool description="Create a new PackageImport" id="package.tool.packageimport"
17
				name="PackageImport" refToolId="clazz.tool.packageimport">
26
				name="PackageImport" refToolId="clazz.tool.packageimport">
18
			</aspectTool>
27
			</aspectTool>
19
			<aspectTool description="Create a new CommentLink" id="package.tool.commentlink"
28
			
20
				name="CommentLink" refToolId="clazz.tool.link">
29
			<!-- Attention : The element is added manually, can combine the two links comment and constraint, and therefore is not deleted -->
30
			<aspectTool description="Create a new Link" id="package.tool.link"
31
				name="Link" refToolId="clazz.tool.link">
21
			</aspectTool>
32
			</aspectTool>
22
						
33
						
23
		</drawer>
34
		</drawer>
35
		
24
	</content>
36
	</content>
25
</paletteDefinition>
37
</paletteDefinition>
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/AbstractionPreferencePage.java (+75 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *		CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg.preferences;
15
16
import java.util.Collections;
17
import java.util.LinkedHashMap;
18
import java.util.Map;
19
20
import org.eclipse.jface.preference.IPreferenceStore;
21
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
22
import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
23
24
public class AbstractionPreferencePage extends PackageDiagramLinkPreferencePage {
25
26
	/** Constant key to access preferences */
27
	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Abstraction"; //$NON-NLS-1$
28
29
	/** The compartments default visibility for preferences */
30
	public static final Map<String, Boolean> labelDefaultVisibilityMap;
31
32
	/** Static attribute initialization */
33
	static {
34
		labelDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
35
		labelDefaultVisibilityMap.put("Name", Boolean.TRUE); //$NON-NLS-1$	
36
		labelDefaultVisibilityMap.put("Stereotype", Boolean.TRUE); //$NON-NLS-1$	
37
38
		// Start of user code custom static initializations
39
		// End of user code
40
41
		Collections.unmodifiableMap(labelDefaultVisibilityMap);
42
	}
43
44
	/** Default constructor */
45
	public AbstractionPreferencePage() {
46
		super();
47
		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Abstraction"); //$NON-NLS-1$
48
	}
49
50
	/**
51
	 * Initialize defaults using a specified {@link IPreferenceStore}
52
	 * 
53
	 * @param store
54
	 *        the preference store.
55
	 */
56
	public static void initDefaults(IPreferenceStore store) {
57
		// Start of user code custom default initializations
58
		// End of user code
59
60
		for(String labelName : labelDefaultVisibilityMap.keySet()) {
61
			String showLabelKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, labelName, PreferenceConstantHelper.LABEL_VISIBILITY);
62
			store.setDefault(showLabelKey, labelDefaultVisibilityMap.get(labelName));
63
		}
64
	}
65
66
	/**
67
	 * {@inheritDoc}
68
	 */
69
	@Override
70
	protected void initializeLabelsList() {
71
		for(String name : labelDefaultVisibilityMap.keySet()) {
72
			this.labelsList.add(name);
73
		}
74
	}
75
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ConstraintConstrainedElementPreferencePage.java (+42 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *		CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg.preferences;
15
16
import org.eclipse.jface.preference.IPreferenceStore;
17
import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
18
19
public class ConstraintConstrainedElementPreferencePage extends PackageDiagramLinkPreferencePage {
20
21
	/** Constant key to access preferences */
22
	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"; //$NON-NLS-1$
23
24
	/** Default constructor */
25
	public ConstraintConstrainedElementPreferencePage() {
26
		super();
27
		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_ConstraintConstrainedElement"); //$NON-NLS-1$
28
	}
29
30
	/**
31
	 * Initialize defaults using a specified {@link IPreferenceStore}
32
	 * 
33
	 * @param store
34
	 *        the preference store.
35
	 */
36
	public static void initDefaults(IPreferenceStore store) {
37
		// Start of user code custom default initializations
38
		// End of user code
39
40
	}
41
42
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ConstraintPreferencePage.java (+42 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *		CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg.preferences;
15
16
import org.eclipse.jface.preference.IPreferenceStore;
17
import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
18
19
public class ConstraintPreferencePage extends PackageDiagramNodePreferencePage {
20
21
	/** Constant key to access preferences */
22
	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Constraint"; //$NON-NLS-1$
23
24
	/** Default constructor */
25
	public ConstraintPreferencePage() {
26
		super();
27
		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Constraint"); //$NON-NLS-1$
28
	}
29
30
	/**
31
	 * Initialize defaults using a specified {@link IPreferenceStore}
32
	 * 
33
	 * @param store
34
	 *        the preference store.
35
	 */
36
	public static void initDefaults(IPreferenceStore store) {
37
		// Start of user code custom default initializations
38
		// End of user code
39
40
	}
41
42
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/ModelPreferencePage.java (+101 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *		CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg.preferences;
15
16
import java.util.Collections;
17
import java.util.LinkedHashMap;
18
import java.util.Map;
19
20
import org.eclipse.jface.preference.IPreferenceStore;
21
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
22
import org.eclipse.papyrus.uml.diagram.pkg.provider.ElementTypes;
23
24
public class ModelPreferencePage extends PackageDiagramNodePreferencePage {
25
26
	/** Constant key to access preferences */
27
	protected static String prefKey = ElementTypes.DIAGRAM_ID + "_Model"; //$NON-NLS-1$
28
29
	/** The compartments default visibility for preferences */
30
	public static final Map<String, Boolean> compartmentDefaultVisibilityMap;
31
32
	/** The compartment titles default visibility for preferences */
33
	public static final Map<String, Boolean> compartmentTitleDefaultVisibilityMap;
34
35
	/** Static attribute initialization */
36
	static {
37
		compartmentDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
38
		compartmentDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$	
39
40
		compartmentTitleDefaultVisibilityMap = new LinkedHashMap<String, Boolean>();
41
		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.TRUE); //$NON-NLS-1$
42
43
		// Start of user code custom static initializations
44
		// End of user code
45
46
		Collections.unmodifiableMap(compartmentDefaultVisibilityMap);
47
		Collections.unmodifiableMap(compartmentTitleDefaultVisibilityMap);
48
	}
49
50
	/** Default constructor */
51
	public ModelPreferencePage() {
52
		super();
53
		setPreferenceKey(ElementTypes.DIAGRAM_ID + "_Model"); //$NON-NLS-1$
54
	}
55
56
	/**
57
	 * Initialize defaults using a specified {@link IPreferenceStore}
58
	 * 
59
	 * @param store
60
	 *        the preference store.
61
	 */
62
	public static void initDefaults(IPreferenceStore store) {
63
		// Start of user code custom default initializations
64
		// End of user code
65
66
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
67
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
68
		// Initialize default visibility for compartments in preference page.
69
		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
70
			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
71
			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
72
		}
73
74
		// Initialize default title visibility for compartments in preference page.
75
		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
76
			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
77
			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
78
		}
79
	}
80
81
	/**
82
	 * {@inheritDoc}
83
	 */
84
	@Override
85
	protected void initializeCompartmentNamesList() {
86
		for(String name : compartmentDefaultVisibilityMap.keySet()) {
87
			this.compartmentNamesList.add(name);
88
		}
89
	}
90
91
	/**
92
	 * {@inheritDoc}
93
	 */
94
	@Override
95
	protected void initializeCompartmentTitlesList() {
96
		for(String name : compartmentTitleDefaultVisibilityMap.keySet()) {
97
			this.compartmentTitlesList.add(name);
98
		}
99
	}
100
101
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/preferences/PackageDiagramPreferenceInitializer.java (-2 / +4 lines)
Lines 27-36 Link Here
27
	public void initializeDefaultPreferences() {
27
	public void initializeDefaultPreferences() {
28
		IPreferenceStore store = getPreferenceStore();
28
		IPreferenceStore store = getPreferenceStore();
29
29
30
		org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage.initDefaults(store);
30
		org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage.initDefaults(store);
31
		org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentPreferencePage.initDefaults(store);
31
		org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentPreferencePage.initDefaults(store);
32
		org.eclipse.papyrus.uml.diagram.pkg.preferences.ConstraintPreferencePage.initDefaults(store);
33
		org.eclipse.papyrus.uml.diagram.pkg.CustomModelPreferencePage.initDefaults(store);
32
		org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage.initDefaults(store);
34
		org.eclipse.papyrus.uml.diagram.pkg.preferences.DependencyPreferencePage.initDefaults(store);
33
		org.eclipse.papyrus.uml.diagram.pkg.preferences.PackageImportPreferencePage.initDefaults(store);
35
		org.eclipse.papyrus.uml.diagram.pkg.preferences.PackageImportPreferencePage.initDefaults(store);
34
		org.eclipse.papyrus.uml.diagram.pkg.preferences.CommentLinkPreferencePage.initDefaults(store);
36
		org.eclipse.papyrus.uml.diagram.pkg.preferences.AbstractionPreferencePage.initDefaults(store);
35
	}
37
	}
36
}
38
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/ElementTypes.java (+28 lines)
Lines 53-58 Link Here
53
53
54
	public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
54
	public static final String COMMENT_CN_LABEL_BODY_HINT = "5063"; //$NON-NLS-1$
55
55
56
	/** ClassDiagram :: CONSTRAINT */
57
	public static final IHintedType CONSTRAINT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_2011"); //$NON-NLS-1$
58
59
	public static final String CONSTRAINT_LABEL_NAME_HINT = "5037"; //$NON-NLS-1$
60
61
	public static final String CONSTRAINT_LABEL_BODY_HINT = "5159"; //$NON-NLS-1$
62
63
	/** ClassDiagram :: CONSTRAINT_CN */
64
	public static final IHintedType CONSTRAINT_CN = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Constraint_3029"); //$NON-NLS-1$
65
66
	public static final String CONSTRAINT_CN_LABEL_NAME_HINT = "5064"; //$NON-NLS-1$
67
68
	public static final String CONSTRAINT_CN_LABEL_BODY_HINT = "5160"; //$NON-NLS-1$
69
70
	/** ClassDiagram :: MODEL */
71
	public static final IHintedType MODEL = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Model_2005"); //$NON-NLS-1$
72
73
	public static final String MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT = "7009"; //$NON-NLS-1$
74
75
	public static final String MODEL_LABEL_NAME_TN_HINT = "5020"; //$NON-NLS-1$
76
56
	/** ClassDiagram :: DEPENDENCY */
77
	/** ClassDiagram :: DEPENDENCY */
57
	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
78
	public static final IHintedType DEPENDENCY = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Dependency_4008"); //$NON-NLS-1$
58
79
Lines 68-71 Link Here
68
	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
89
	/** ClassDiagram :: COMMENT_ANNOTATED_ELEMENT */
69
	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
90
	public static final IHintedType COMMENT_ANNOTATED_ELEMENT = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.CommentAnnotatedElement_4013"); //$NON-NLS-1$
70
91
92
	/** ClassDiagram :: ABSTRACTION */
93
	public static final IHintedType ABSTRACTION = (IHintedType)getElementType("org.eclipse.papyrus.uml.diagram.clazz.Abstraction_4006"); //$NON-NLS-1$
94
95
	public static final String ABSTRACTION_LABEL_NAME_HINT = "6014"; //$NON-NLS-1$
96
97
	public static final String ABSTRACTION_LABEL_APPLIED_STEREOTYPE_HINT = "6015"; //$NON-NLS-1$
98
71
}
99
}
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/GraphicalTypeRegistry.java (+36 lines)
Lines 41-46 Link Here
41
		// Fill known edges set
41
		// Fill known edges set
42
		knownEdges.add(ElementTypes.DEPENDENCY.getSemanticHint());
42
		knownEdges.add(ElementTypes.DEPENDENCY.getSemanticHint());
43
		knownEdges.add(ElementTypes.PACKAGE_IMPORT.getSemanticHint());
43
		knownEdges.add(ElementTypes.PACKAGE_IMPORT.getSemanticHint());
44
		knownEdges.add(ElementTypes.ABSTRACTION.getSemanticHint());
44
		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
45
		knownEdges.add(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint());
45
46
46
		// Fill known nodes set (primary nodes)
47
		// Fill known nodes set (primary nodes)
Lines 48-53 Link Here
48
		knownNodes.add(ElementTypes.PACKAGE_CN.getSemanticHint());
49
		knownNodes.add(ElementTypes.PACKAGE_CN.getSemanticHint());
49
		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
50
		knownNodes.add(ElementTypes.COMMENT.getSemanticHint());
50
		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
51
		knownNodes.add(ElementTypes.COMMENT_CN.getSemanticHint());
52
		knownNodes.add(ElementTypes.CONSTRAINT.getSemanticHint());
53
		knownNodes.add(ElementTypes.CONSTRAINT_CN.getSemanticHint());
54
		knownNodes.add(ElementTypes.MODEL.getSemanticHint());
51
55
52
		// Fill known nodes set (child label nodes)
56
		// Fill known nodes set (child label nodes)
53
	}
57
	}
Lines 67-72 Link Here
67
		if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
71
		if(domainElement instanceof org.eclipse.uml2.uml.PackageImport) {
68
			graphicalType = ElementTypes.PACKAGE_IMPORT.getSemanticHint();
72
			graphicalType = ElementTypes.PACKAGE_IMPORT.getSemanticHint();
69
		}
73
		}
74
		if(domainElement instanceof org.eclipse.uml2.uml.Abstraction) {
75
			graphicalType = ElementTypes.ABSTRACTION.getSemanticHint();
76
		}
70
		return graphicalType;
77
		return graphicalType;
71
	}
78
	}
72
79
Lines 110-115 Link Here
110
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
117
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
111
				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
118
				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
112
			}
119
			}
120
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
121
				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
122
			}
113
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
123
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Package ChildNode
114
				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
124
				graphicalType = ElementTypes.PACKAGE_CN.getSemanticHint();
115
			}
125
			}
Lines 123-134 Link Here
123
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
133
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
124
				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
134
				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
125
			}
135
			}
136
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
137
				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
138
			}
126
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
139
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Comment ChildNode
127
				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
140
				graphicalType = ElementTypes.COMMENT_CN.getSemanticHint();
128
			}
141
			}
129
142
130
		}
143
		}
131
144
145
		if(domainElement instanceof org.eclipse.uml2.uml.Constraint) {
146
			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Constraint TopNode
147
				graphicalType = ElementTypes.CONSTRAINT.getSemanticHint();
148
			}
149
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
150
				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
151
			}
152
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
153
				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
154
			}
155
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerType)) { // Constraint ChildNode
156
				graphicalType = ElementTypes.CONSTRAINT_CN.getSemanticHint();
157
			}
158
159
		}
160
161
		if(domainElement instanceof org.eclipse.uml2.uml.Model) {
162
			if(ElementTypes.DIAGRAM_ID.equals(containerType)) { // Model TopNode
163
				graphicalType = ElementTypes.MODEL.getSemanticHint();
164
			}
165
166
		}
167
132
		return graphicalType;
168
		return graphicalType;
133
	}
169
	}
134
170
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramEditPartProvider.java (+9 lines)
Lines 42-47 Link Here
42
			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
42
			if(eobject instanceof org.eclipse.uml2.uml.Comment) {
43
				return true;
43
				return true;
44
			}
44
			}
45
			if(eobject instanceof org.eclipse.uml2.uml.Constraint) {
46
				return true;
47
			}
48
			if(eobject instanceof org.eclipse.uml2.uml.Model) {
49
				return true;
50
			}
45
51
46
			/** Edges *********** */
52
			/** Edges *********** */
47
			if(eobject instanceof org.eclipse.uml2.uml.Dependency) {
53
			if(eobject instanceof org.eclipse.uml2.uml.Dependency) {
Lines 50-55 Link Here
50
			if(eobject instanceof org.eclipse.uml2.uml.PackageImport) {
56
			if(eobject instanceof org.eclipse.uml2.uml.PackageImport) {
51
				return true;
57
				return true;
52
			}
58
			}
59
			if(eobject instanceof org.eclipse.uml2.uml.Abstraction) {
60
				return true;
61
			}
53
62
54
			// Additional test needed here to decide whether to support Feature type links.
63
			// Additional test needed here to decide whether to support Feature type links.
55
			// As feature type link are not related to a MetaClass from the domain model
64
			// As feature type link are not related to a MetaClass from the domain model
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/InheritedClassDiagramViewProvider.java (-6 / +42 lines)
Lines 62-67 Link Here
62
				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
62
				if(ElementTypes.COMMENT_ANNOTATED_ELEMENT.getSemanticHint().equals(domainElementGraphicalType)) {
63
					createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
63
					createdEdge = createCommentAnnotatedElement_4013(containerView, index, persisted, preferencesHint);
64
				}
64
				}
65
				if(ElementTypes.ABSTRACTION.getSemanticHint().equals(domainElementGraphicalType)) {
66
					createdEdge = createAbstraction_4006(domainElement, containerView, index, persisted, preferencesHint);
67
				}
65
			}
68
			}
66
		}
69
		}
67
70
Lines 108-113 Link Here
108
		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
111
		if(elementType == ElementTypes.COMMENT_ANNOTATED_ELEMENT) {
109
			return true;
112
			return true;
110
		}
113
		}
114
		if(elementType == ElementTypes.ABSTRACTION) {
115
			return true;
116
		}
111
117
112
		// /////////////////////////////////////////////////////////////////////
118
		// /////////////////////////////////////////////////////////////////////
113
		// Test possibility to provide a view based on the semantic nature and its expected container.
119
		// Test possibility to provide a view based on the semantic nature and its expected container.
Lines 156-167 Link Here
156
			}
162
			}
157
		}
163
		}
158
		if(elementType == ElementTypes.PACKAGE_CN) {
164
		if(elementType == ElementTypes.PACKAGE_CN) {
159
			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@339c674e (visualID: 3009, editPartClassName: PackageEditPartCN, itemSemanticEditPolicyClassName: PackageItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackageCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: PackageGraphicalNodeEditPolicyCN, createCommandClassName: PackageCreateCommandCN)
165
			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@56c24e1c (visualID: 3009, editPartClassName: PackageEditPartCN, itemSemanticEditPolicyClassName: PackageItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackageCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: PackageGraphicalNodeEditPolicyCN, createCommandClassName: PackageCreateCommandCN)
160
			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@47a2da98 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3cb4c75f (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@8d4d1c (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@1f236dde (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
166
			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@496f5eed (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@58b333c7 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@61d4e023 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@79dbfb56 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
161
			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@5a9760a3 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
167
			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@514d41b8 (name: null) (customPreferencePage: org.eclipse.papyrus.uml.diagram.pkg.CustomPackagePreferencePage, generatePreferencePage: false, generateTool: false)
162
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
168
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
163
				return true;
169
				return true;
164
			}
170
			}
171
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
172
				return true;
173
			}
165
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
174
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
166
				return true;
175
				return true;
167
			}
176
			}
Lines 172-187 Link Here
172
			}
181
			}
173
		}
182
		}
174
		if(elementType == ElementTypes.COMMENT_CN) {
183
		if(elementType == ElementTypes.COMMENT_CN) {
175
			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@14a1b15 (visualID: 3028, editPartClassName: CommentEditPartCN, itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: CommentCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicyCN, createCommandClassName: CommentCreateCommandCN)
184
			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@35f8045c (visualID: 3028, editPartClassName: CommentEditPartCN, itemSemanticEditPolicyClassName: CommentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: CommentCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: CommentGraphicalNodeEditPolicyCN, createCommandClassName: CommentCreateCommandCN)
176
			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@47a2da98 (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@3cb4c75f (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@8d4d1c (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@1f236dde (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
185
			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@496f5eed (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@58b333c7 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@61d4e023 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@79dbfb56 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
177
			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@18937254 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
186
			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@5204909 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
178
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
187
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
179
				return true;
188
				return true;
180
			}
189
			}
190
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
191
				return true;
192
			}
181
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
193
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
182
				return true;
194
				return true;
183
			}
195
			}
184
		}
196
		}
197
		if(elementType == ElementTypes.CONSTRAINT) {
198
			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
199
				return true;
200
			}
201
		}
202
		if(elementType == ElementTypes.CONSTRAINT_CN) {
203
			// node: org.eclipse.gmf.codegen.gmfgen.impl.GenChildNodeImpl@156cb35a (visualID: 3029, editPartClassName: ConstraintEditPartCN, itemSemanticEditPolicyClassName: ConstraintItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ConstraintCanonicalEditPolicyCN) (primaryDragEditPolicyQualifiedClassName: null, graphicalNodeEditPolicyClassName: ConstraintGraphicalNodeEditPolicyCN, createCommandClassName: ConstraintCreateCommandCN)
204
			// containers: org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@496f5eed (visualID: 7010, editPartClassName: PackagePackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@58b333c7 (visualID: 7009, editPartClassName: ModelPackageableElementCompartmentEditPartTN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyTN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyTN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@61d4e023 (visualID: 7030, editPartClassName: ModelPackageableElementCompartmentEditPartCN, itemSemanticEditPolicyClassName: ModelPackageableElementCompartmentItemSemanticEditPolicyCN, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: ModelPackageableElementCompartmentCanonicalEditPolicyCN) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)org.eclipse.gmf.codegen.gmfgen.impl.GenCompartmentImpl@79dbfb56 (visualID: 7016, editPartClassName: PackagePackageableElementCompartmentEditPart, itemSemanticEditPolicyClassName: PackagePackageableElementCompartmentItemSemanticEditPolicy, notationViewFactoryClassName: null) (canonicalEditPolicyClassName: PackagePackageableElementCompartmentCanonicalEditPolicy) (title: PackageableElementCompartment, canCollapse: false, hideIfEmpty: true, needsTitle: true, listLayout: false)
205
			// nodeRef: org.eclipse.papyrus.generation.diagram.idgen.impl.GenNodeRefImpl@422368f0 (name: null) (customPreferencePage: null, generatePreferencePage: false, generateTool: false)
206
			if(ElementTypes.PACKAGE_CN_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
207
				return true;
208
			}
209
			if(ElementTypes.MODEL_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
210
				return true;
211
			}
212
			if(ElementTypes.PACKAGE_COMPARTMENT_PACKAGEABLE_ELEMENT_HINT.equals(containerGraphicalType)) {
213
				return true;
214
			}
215
		}
216
		if(elementType == ElementTypes.MODEL) {
217
			if(ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
218
				return true;
219
			}
220
		}
185
221
186
		// /////////////////////////////////////////////////////////////////////
222
		// /////////////////////////////////////////////////////////////////////
187
		// Test possibility to provide a view based on the semantic nature and its expected container.
223
		// Test possibility to provide a view based on the semantic nature and its expected container.
(-)src-gen/org/eclipse/papyrus/uml/diagram/pkg/provider/PackageDiagramEditPolicyProvider.java (+12 lines)
Lines 54-59 Link Here
54
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
54
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.CommentEditPartCN) {
55
			return true;
55
			return true;
56
		}
56
		}
57
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPart) {
58
			return true;
59
		}
60
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ConstraintEditPartCN) {
61
			return true;
62
		}
63
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelEditPartTN) {
64
			return true;
65
		}
66
		if(gep instanceof org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ModelPackageableElementCompartmentEditPartTN) {
67
			return true;
68
		}
57
69
58
		return false;
70
		return false;
59
	}
71
	}
(-)src/org/eclipse/papyrus/uml/diagram/pkg/CustomModelPreferencePage.java (+51 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *	Nizar GUEDIDI	CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg;
15
16
import org.eclipse.jface.preference.IPreferenceStore;
17
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
18
import org.eclipse.papyrus.uml.diagram.pkg.preferences.ModelPreferencePage;
19
20
public class CustomModelPreferencePage extends ModelPreferencePage {
21
22
	static {
23
		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
24
	}
25
26
	/**
27
	 * Initialize defaults using a specified {@link IPreferenceStore}
28
	 * 
29
	 * @param store
30
	 *        the preference store.
31
	 */
32
	public static void initDefaults(IPreferenceStore store) {
33
		// Start of user code custom default initializations
34
		// End of user code
35
36
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
37
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
38
		// Initialize default visibility for compartments in preference page.
39
		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
40
			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
41
			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
42
		}
43
44
		// Initialize default title visibility for compartments in preference page.
45
		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
46
			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
47
			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
48
		}
49
	}
50
51
}
(-)src/org/eclipse/papyrus/uml/diagram/pkg/CustomPackagePreferencePage.java (+51 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2011 CEA LIST.
3
 *
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *		
11
 *	Nizar GUEDIDI CEA LIST - Initial API and implementation
12
 *
13
 *****************************************************************************/
14
package org.eclipse.papyrus.uml.diagram.pkg;
15
16
import org.eclipse.jface.preference.IPreferenceStore;
17
import org.eclipse.papyrus.infra.gmfdiag.preferences.utils.PreferenceConstantHelper;
18
import org.eclipse.papyrus.uml.diagram.pkg.preferences.PackagePreferencePage;
19
20
public class CustomPackagePreferencePage extends PackagePreferencePage {
21
22
	static {
23
		compartmentTitleDefaultVisibilityMap.put("PackageableElementCompartment", Boolean.FALSE); //$NON-NLS-1$
24
	}
25
26
	/**
27
	 * Initialize defaults using a specified {@link IPreferenceStore}
28
	 * 
29
	 * @param store
30
	 *        the preference store.
31
	 */
32
	public static void initDefaults(IPreferenceStore store) {
33
		// Start of user code custom default initializations
34
		// End of user code
35
36
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.WIDTH), 200);
37
		store.setDefault(PreferenceConstantHelper.getElementConstant(prefKey, PreferenceConstantHelper.HEIGHT), 100);
38
		// Initialize default visibility for compartments in preference page.
39
		for(String compartmentName : compartmentDefaultVisibilityMap.keySet()) {
40
			String showCompartmentKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_VISIBILITY);
41
			store.setDefault(showCompartmentKey, compartmentDefaultVisibilityMap.get(compartmentName));
42
		}
43
44
		// Initialize default title visibility for compartments in preference page.
45
		for(String compartmentName : compartmentTitleDefaultVisibilityMap.keySet()) {
46
			String showCompartmentTitleKey = PreferenceConstantHelper.getCompartmentElementConstant(prefKey, compartmentName, PreferenceConstantHelper.COMPARTMENT_NAME_VISIBILITY);
47
			store.setDefault(showCompartmentTitleKey, compartmentTitleDefaultVisibilityMap.get(compartmentName));
48
		}
49
	}
50
51
}
(-)src/org/eclipse/papyrus/uml/diagram/pkg/provider/CPackageEditPartProvider.java (+47 lines)
Line 0 Link Here
1
/*****************************************************************************
2
 * Copyright (c) 2013 CEA LIST.
3
 * 
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
7
 * http://www.eclipse.org/legal/epl-v10.html
8
 *
9
 * Contributors:
10
 *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
11
 *****************************************************************************/
12
package org.eclipse.papyrus.uml.diagram.pkg.provider;
13
14
import org.eclipse.gmf.runtime.common.core.service.IOperation;
15
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
16
import org.eclipse.gmf.runtime.diagram.ui.services.editpart.CreateGraphicEditPartOperation;
17
import org.eclipse.gmf.runtime.diagram.ui.services.editpart.IEditPartOperation;
18
import org.eclipse.gmf.runtime.notation.View;
19
import org.eclipse.papyrus.uml.diagram.clazz.custom.providers.CUMLEditPartProvider;
20
import org.eclipse.papyrus.uml.diagram.clazz.part.UMLVisualIDRegistry;
21
22
/**
23
 * Reuse the Custom EditPartProvider from the Class Diagram
24
 * 
25
 * @author Camille Letavernier
26
 */
27
public class CPackageEditPartProvider extends CUMLEditPartProvider {
28
29
	@Override
30
	public synchronized boolean provides(IOperation operation) {
31
		super.provides(operation);
32
		if(operation instanceof CreateGraphicEditPartOperation) {
33
			View view = ((IEditPartOperation)operation).getView();
34
			if(!ElementTypes.DIAGRAM_ID.equals(UMLVisualIDRegistry.getModelID(view))) {
35
				return false;
36
			}
37
			if(isAllowCaching() && getCachedPart(view) != null) {
38
				return true;
39
			}
40
			IGraphicalEditPart part = createEditPart(view);
41
			if(part != null) {
42
				return true;
43
			}
44
		}
45
		return false;
46
	}
47
}

Return to bug 402895