Revision 113

View differences:

trunk/src/com/modeliosoft/modelio/javadesigner/impl/JavaDesignerSession.java
98 98
        configuration.setParameterValue (JavaDesignerParameters.USEEXTERNALEDITION, "false"); //$NON-NLS-1$
99 99
        configuration.setParameterValue (JavaDesignerParameters.USEJAVAH, "true"); //$NON-NLS-1$
100 100
        configuration.setParameterValue (JavaDesignerParameters.ENCODING, "UTF-8"); //$NON-NLS-1$
101
        configuration.setParameterValue (JavaDesignerParameters.GENERATEDEFAULTRETURN, "true"); //$NON-NLS-1$
101 102
        return super.select ();
102 103
    }
103 104

  
......
110 111
        String fullVersion = completeVersion.substring (0, pos);
111 112

  
112 113
        // Display the copyright
113
        Modelio.out.println ("Modelio/" + this.mdac.getName () + " " + fullVersion + " - Copyright 2008-2011 Modeliosoft"); //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
114
        Modelio.out.println ("Modelio/" + this.mdac.getName () + " " + fullVersion + " - Copyright 2008-2012 Modeliosoft"); //$NON-NLS-1$ //$NON-NLS-2$  //$NON-NLS-3$
114 115
        
115 116
        /*
116 117
         * Notifications
......
347 348
            } else {
348 349
                super.upgrade (oldVersion, oldParameters);
349 350
            }
350
        
351
            
352
            // Init 'generate default return' parameter
353
            if (oldVersion.isOlderThan (new Version (2, 0, 13, 8006))) {
354
                config.setParameterValue (JavaDesignerParameters.GENERATEDEFAULTRETURN, "true"); //$NON-NLS-1$
355
            }
356
            
351 357
            String encoding = config.getParameterValue (JavaDesignerParameters.ENCODING); //$NON-NLS-1$
352 358
            if (encoding == null || encoding.equals ("")) {
353 359
                config.setParameterValue (JavaDesignerParameters.ENCODING, "UTF-8"); //$NON-NLS-1$
trunk/src/com/modeliosoft/modelio/javadesigner/impl/JavaDesignerMdac.java
27 27
import com.modeliosoft.modelio.api.model.uml.statik.INameSpace;
28 28
import com.modeliosoft.modelio.api.model.uml.statik.IPackage;
29 29
import com.modeliosoft.modelio.api.module.IMdacConfiguration;
30
import com.modeliosoft.modelio.javadesigner.api.JavaDesignerParameters;
30 31
import com.modeliosoft.modelio.javadesigner.commands.BuildAntFile;
31 32
import com.modeliosoft.modelio.javadesigner.commands.CreateAntArtifact;
32 33
import com.modeliosoft.modelio.javadesigner.commands.CreateAssociationEndProperty;
......
73 74
        this.session  = new JavaDesignerSession(this);
74 75
        this.peerMdac = new JavaDesignerPeerMdac(this);
75 76
        this.peerMdac.init();
76
        
77

  
77 78
        this.propertyPages.add(new Java(this, "Java", Messages.getString ("Mdac.Java.Label"), "res/bmp/JavaDesigner.png"));
78
                IMdacAction action = null;
79
        IMdacAction action = null;
79 80
        IMdacContextualCommand command = null;
80
                // Define the commands
81
        
81
        // Define the commands
82

  
82 83
        try{
83 84
            command = new Generate();
84 85
            action  = new DefaultMdacAction (this, "Generate", Messages.getString ("Ui.Command.Generate.Label"), Messages.getString ("Ui.Command.Generate.Tooltip"), "res/bmp/generate.png", Messages.getString ("Ui.Command.Generate.Slot"), Messages.getString ("Ui.Command.Generate.SlotImage"),false, false, command);
......
316 317
            IParameterModel parameter;
317 318
            EnumParameterModel enum_parameter;
318 319
            this.parameterEditionModel = parameters;
320

  
319 321
            ParameterGroupModel Group01 = new ParameterGroupModel("Group01", Messages.getString ("Ui.Parameter.Group01"));
320 322
            parameters.addGroup(Group01);
321
            enum_parameter = new EnumParameterModel(configuration,"GenerationMode", Messages.getString ("Ui.Parameter.GenerationMode.Label"), Messages.getString ("Ui.Parameter.GenerationMode.Description"),"");
322
        enum_parameter.addItem("RoundTrip",Messages.getString ("Ui.Parameter.GenerationMode.RoundTrip"));
323
        enum_parameter.addItem("ModelDriven",Messages.getString ("Ui.Parameter.GenerationMode.ModelDriven"));
324
        enum_parameter.addItem("Release",Messages.getString ("Ui.Parameter.GenerationMode.Release"));
325
        parameter = enum_parameter;
326
        Group01.addParameter (parameter);
327
            enum_parameter = new EnumParameterModel(configuration,"RetrieveDefaultBehaviour", Messages.getString ("Ui.Parameter.RetrieveDefaultBehaviour.Label"), Messages.getString ("Ui.Parameter.RetrieveDefaultBehaviour.Description"),"");
328
        enum_parameter.addItem("Ask",Messages.getString ("Ui.Parameter.RetrieveMode.Ask"));
329
        enum_parameter.addItem("Retrieve",Messages.getString ("Ui.Parameter.RetrieveMode.Retrieve"));
330
        enum_parameter.addItem("Keep",Messages.getString ("Ui.Parameter.RetrieveMode.Keep"));
331
        parameter = enum_parameter;
332
        Group01.addParameter (parameter);
333
            enum_parameter = new EnumParameterModel(configuration,"Encoding", Messages.getString ("Ui.Parameter.Encoding.Label"), Messages.getString ("Ui.Parameter.Encoding.Description"),"UTF-8");
334
        enum_parameter.addItem("ISO-8859-1",Messages.getString ("Ui.Parameter.Encodings.ISOmoins8859moins1"));
335
        enum_parameter.addItem("US-ASCII",Messages.getString ("Ui.Parameter.Encodings.USmoinsASCII"));
336
        enum_parameter.addItem("UTF-8",Messages.getString ("Ui.Parameter.Encodings.UTFmoins8"));
337
        enum_parameter.addItem("UTF-16BE",Messages.getString ("Ui.Parameter.Encodings.UTFmoins16BE"));
338
        enum_parameter.addItem("UTF-16LE",Messages.getString ("Ui.Parameter.Encodings.UTFmoins16LE"));
339
        enum_parameter.addItem("UTF-16",Messages.getString ("Ui.Parameter.Encodings.UTFmoins16"));
340
        parameter = enum_parameter;
341
        Group01.addParameter (parameter);
323
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.GENERATIONMODE, Messages.getString ("Ui.Parameter.GenerationMode.Label"), Messages.getString ("Ui.Parameter.GenerationMode.Description"),"");
324
            enum_parameter.addItem(JavaDesignerParameters.GenerationMode.RoundTrip.toString(), Messages.getString ("Ui.Parameter.GenerationMode.RoundTrip"));
325
            enum_parameter.addItem(JavaDesignerParameters.GenerationMode.ModelDriven.toString(), Messages.getString ("Ui.Parameter.GenerationMode.ModelDriven"));
326
            enum_parameter.addItem(JavaDesignerParameters.GenerationMode.Release.toString(), Messages.getString ("Ui.Parameter.GenerationMode.Release"));
327
            parameter = enum_parameter;
328
            Group01.addParameter (parameter);
329
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.RETRIEVEDEFAULTBEHAVIOUR, Messages.getString ("Ui.Parameter.RetrieveDefaultBehaviour.Label"), Messages.getString ("Ui.Parameter.RetrieveDefaultBehaviour.Description"),"");
330
            enum_parameter.addItem(JavaDesignerParameters.RetrieveMode.Ask.toString(), Messages.getString ("Ui.Parameter.RetrieveMode.Ask"));
331
            enum_parameter.addItem(JavaDesignerParameters.RetrieveMode.Retrieve.toString(), Messages.getString ("Ui.Parameter.RetrieveMode.Retrieve"));
332
            enum_parameter.addItem(JavaDesignerParameters.RetrieveMode.Keep.toString(), Messages.getString ("Ui.Parameter.RetrieveMode.Keep"));
333
            parameter = enum_parameter;
334
            Group01.addParameter (parameter);
335
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.ENCODING, Messages.getString ("Ui.Parameter.Encoding.Label"), Messages.getString ("Ui.Parameter.Encoding.Description"),"UTF-8");
336
            enum_parameter.addItem("ISO-8859-1", Messages.getString ("Ui.Parameter.Encodings.ISOmoins8859moins1"));
337
            enum_parameter.addItem("US-ASCII", Messages.getString ("Ui.Parameter.Encodings.USmoinsASCII"));
338
            enum_parameter.addItem("UTF-8", Messages.getString ("Ui.Parameter.Encodings.UTFmoins8"));
339
            enum_parameter.addItem("UTF-16BE", Messages.getString ("Ui.Parameter.Encodings.UTFmoins16BE"));
340
            enum_parameter.addItem("UTF-16LE", Messages.getString ("Ui.Parameter.Encodings.UTFmoins16LE"));
341
            enum_parameter.addItem("UTF-16", Messages.getString ("Ui.Parameter.Encodings.UTFmoins16"));
342
            parameter = enum_parameter;
343
            Group01.addParameter (parameter);
344

  
342 345
            ParameterGroupModel Group11 = new ParameterGroupModel("Group11", Messages.getString ("Ui.Parameter.Group11"));
343 346
            parameters.addGroup(Group11);
344
            parameter = new DirectoryParameterModel(configuration,"JDKPath", Messages.getString ("Ui.Parameter.JDKPath.Label"), Messages.getString ("Ui.Parameter.JDKPath.Description"),"");
345
        Group11.addParameter (parameter);
346
//            parameter = new StringParameterModel(configuration,"AccessibleClasses", Messages.getString ("Ui.Parameter.AccessibleClasses.Label"), Messages.getString ("Ui.Parameter.AccessibleClasses.Description"),"");
347
//        Group11.addParameter (parameter);
348
            parameter = new DirectoryParameterModel(configuration,"GenerationPath", Messages.getString ("Ui.Parameter.GenerationPath.Label"), Messages.getString ("Ui.Parameter.GenerationPath.Description"),"");
349
        Group11.addParameter (parameter);
350
            parameter = new DirectoryParameterModel(configuration,"JavahGenerationPath", Messages.getString ("Ui.Parameter.JavahGenerationPath.Label"), Messages.getString ("Ui.Parameter.JavahGenerationPath.Description"),"");
351
        Group11.addParameter (parameter);
352
            parameter = new DirectoryParameterModel(configuration,"CompilationPath", Messages.getString ("Ui.Parameter.CompilationPath.Label"), Messages.getString ("Ui.Parameter.CompilationPath.Description"),"");
353
        Group11.addParameter (parameter);
354
            parameter = new DirectoryParameterModel(configuration,"JarFilePath", Messages.getString ("Ui.Parameter.JarFilePath.Label"), Messages.getString ("Ui.Parameter.JarFilePath.Description"),"");
355
        Group11.addParameter (parameter);
356
            parameter = new DirectoryParameterModel(configuration,"GenDocPath", Messages.getString ("Ui.Parameter.GenDocPath.Label"), Messages.getString ("Ui.Parameter.GenDocPath.Description"),"");
357
        Group11.addParameter (parameter);
347
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.JDKPATH, Messages.getString ("Ui.Parameter.JDKPath.Label"), Messages.getString ("Ui.Parameter.JDKPath.Description"),"");
348
            Group11.addParameter (parameter);
349
            // parameter = new StringParameterModel(configuration, JavaDesignerParameters.AccessibleClasses, Messages.getString ("Ui.Parameter.AccessibleClasses.Label"), Messages.getString ("Ui.Parameter.AccessibleClasses.Description"),"");
350
            // Group11.addParameter (parameter);
351
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.GENERATIONPATH, Messages.getString ("Ui.Parameter.GenerationPath.Label"), Messages.getString ("Ui.Parameter.GenerationPath.Description"),"");
352
            Group11.addParameter (parameter);
353
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.JAVAHGENERATIONPATH, Messages.getString ("Ui.Parameter.JavahGenerationPath.Label"), Messages.getString ("Ui.Parameter.JavahGenerationPath.Description"),"");
354
            Group11.addParameter (parameter);
355
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.COMPILATIONPATH, Messages.getString ("Ui.Parameter.CompilationPath.Label"), Messages.getString ("Ui.Parameter.CompilationPath.Description"),"");
356
            Group11.addParameter (parameter);
357
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.JARFILEPATH, Messages.getString ("Ui.Parameter.JarFilePath.Label"), Messages.getString ("Ui.Parameter.JarFilePath.Description"),"");
358
            Group11.addParameter (parameter);
359
            parameter = new DirectoryParameterModel(configuration, JavaDesignerParameters.GENDOCPATH, Messages.getString ("Ui.Parameter.GenDocPath.Label"), Messages.getString ("Ui.Parameter.GenDocPath.Description"),"");
360
            Group11.addParameter (parameter);
361

  
358 362
            ParameterGroupModel Group21 = new ParameterGroupModel("Group21", Messages.getString ("Ui.Parameter.Group21"));
359 363
            parameters.addGroup(Group21);
360
            parameter = new FileParameterModel(configuration,"CustomizationFile", Messages.getString ("Ui.Parameter.CustomizationFile.Label"), Messages.getString ("Ui.Parameter.CustomizationFile.Description"),"");
361
        Group21.addParameter (parameter);
362
            parameter = new FileParameterModel(configuration,"CopyrightFile", Messages.getString ("Ui.Parameter.CopyrightFile.Label"), Messages.getString ("Ui.Parameter.CopyrightFile.Description"),"");
363
        Group21.addParameter (parameter);
364
            parameter = new BoolParameterModel(configuration,"ErrorOnFirstWarning", Messages.getString ("Ui.Parameter.ErrorOnFirstWarning.Label"), Messages.getString ("Ui.Parameter.ErrorOnFirstWarning.Description"),"");
365
        Group21.addParameter (parameter);
366
            parameter = new BoolParameterModel(configuration,"ReadOnlyElementNotGenerated", Messages.getString ("Ui.Parameter.ReadOnlyElementNotGenerated.Label"), Messages.getString ("Ui.Parameter.ReadOnlyElementNotGenerated.Description"),"");
367
        Group21.addParameter (parameter);
368
            parameter = new BoolParameterModel(configuration,"LockGeneratedFiles", Messages.getString ("Ui.Parameter.LockGeneratedFiles.Label"), Messages.getString ("Ui.Parameter.LockGeneratedFiles.Description"),"");
369
        Group21.addParameter (parameter);
370
            parameter = new BoolParameterModel(configuration,"FullNameGeneration", Messages.getString ("Ui.Parameter.FullNameGeneration.Label"), Messages.getString ("Ui.Parameter.FullNameGeneration.Description"),"");
371
        Group21.addParameter (parameter);
372
            parameter = new BoolParameterModel(configuration,"GenerateFinalParameters", Messages.getString ("Ui.Parameter.GenerateFinalParameters.Label"), Messages.getString ("Ui.Parameter.GenerateFinalParameters.Description"),"");
373
        Group21.addParameter (parameter);
364
            parameter = new FileParameterModel(configuration, JavaDesignerParameters.CUSTOMIZATIONFILE, Messages.getString ("Ui.Parameter.CustomizationFile.Label"), Messages.getString ("Ui.Parameter.CustomizationFile.Description"),"");
365
            Group21.addParameter (parameter);
366
            parameter = new FileParameterModel(configuration, JavaDesignerParameters.COPYRIGHTFILE, Messages.getString ("Ui.Parameter.CopyrightFile.Label"), Messages.getString ("Ui.Parameter.CopyrightFile.Description"),"");
367
            Group21.addParameter (parameter);
368
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.ERRORONFIRSTWARNING, Messages.getString ("Ui.Parameter.ErrorOnFirstWarning.Label"), Messages.getString ("Ui.Parameter.ErrorOnFirstWarning.Description"),"");
369
            Group21.addParameter (parameter);
370
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.READONLYELEMENTNOTGENERATED, Messages.getString ("Ui.Parameter.ReadOnlyElementNotGenerated.Label"), Messages.getString ("Ui.Parameter.ReadOnlyElementNotGenerated.Description"),"");
371
            Group21.addParameter (parameter);
372
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.LOCKGENERATEDFILES, Messages.getString ("Ui.Parameter.LockGeneratedFiles.Label"), Messages.getString ("Ui.Parameter.LockGeneratedFiles.Description"),"");
373
            Group21.addParameter (parameter);
374
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.FULLNAMEGENERATION, Messages.getString ("Ui.Parameter.FullNameGeneration.Label"), Messages.getString ("Ui.Parameter.FullNameGeneration.Description"),"");
375
            Group21.addParameter (parameter);
376
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.GENERATEFINALPARAMETERS, Messages.getString ("Ui.Parameter.GenerateFinalParameters.Label"), Messages.getString ("Ui.Parameter.GenerateFinalParameters.Description"),"");
377
            Group21.addParameter (parameter);
378
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.GENERATEDEFAULTRETURN, Messages.getString ("Ui.Parameter.GenerateDefaultReturn.Label"), Messages.getString ("Ui.Parameter.GenerateDefaultReturn.Description"),"");
379
            Group21.addParameter (parameter);
380

  
374 381
            ParameterGroupModel Group31 = new ParameterGroupModel("Group31", Messages.getString ("Ui.Parameter.Group31"));
375 382
            parameters.addGroup(Group31);
376
            enum_parameter = new EnumParameterModel(configuration,"InterfaceImplementation", Messages.getString ("Ui.Parameter.InterfaceImplementation.Label"), Messages.getString ("Ui.Parameter.InterfaceImplementation.Description"),"");
377
        enum_parameter.addItem("Ask",Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Ask"));
378
        enum_parameter.addItem("Always",Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Always"));
379
        enum_parameter.addItem("Never",Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Never"));
380
        parameter = enum_parameter;
381
        Group31.addParameter (parameter);
382
            enum_parameter = new EnumParameterModel(configuration,"AccessorsGeneration", Messages.getString ("Ui.Parameter.AccessorsGeneration.Label"), Messages.getString ("Ui.Parameter.AccessorsGeneration.Description"),"");
383
        enum_parameter.addItem("Always",Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Always"));
384
        enum_parameter.addItem("Smart",Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Smart"));
385
        enum_parameter.addItem("Never",Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Never"));
386
        parameter = enum_parameter;
387
        Group31.addParameter (parameter);
388
            enum_parameter = new EnumParameterModel(configuration,"PublicAccessorVisibility", Messages.getString ("Ui.Parameter.PublicAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.PublicAccessorVisibility.Description"),"");
389
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
390
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
391
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
392
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
393
        parameter = enum_parameter;
394
        Group31.addParameter (parameter);
395
            enum_parameter = new EnumParameterModel(configuration,"PublicModifierVisibility", Messages.getString ("Ui.Parameter.PublicModifierVisibility.Label"), Messages.getString ("Ui.Parameter.PublicModifierVisibility.Description"),"");
396
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
397
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
398
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
399
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
400
        parameter = enum_parameter;
401
        Group31.addParameter (parameter);
402
            enum_parameter = new EnumParameterModel(configuration,"ProtectedAccessorVisibility", Messages.getString ("Ui.Parameter.ProtectedAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.ProtectedAccessorVisibility.Description"),"");
403
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
404
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
405
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
406
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
407
        parameter = enum_parameter;
408
        Group31.addParameter (parameter);
409
            enum_parameter = new EnumParameterModel(configuration,"ProtectedModifierVisibility", Messages.getString ("Ui.Parameter.ProtectedModifierVisibility.Label"), Messages.getString ("Ui.Parameter.ProtectedModifierVisibility.Description"),"");
410
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
411
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
412
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
413
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
414
        parameter = enum_parameter;
415
        Group31.addParameter (parameter);
416
            enum_parameter = new EnumParameterModel(configuration,"FriendlyAccessorVisibility", Messages.getString ("Ui.Parameter.FriendlyAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.FriendlyAccessorVisibility.Description"),"");
417
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
418
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
419
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
420
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
421
        parameter = enum_parameter;
422
        Group31.addParameter (parameter);
423
            enum_parameter = new EnumParameterModel(configuration,"FriendlyModifierVisibility", Messages.getString ("Ui.Parameter.FriendlyModifierVisibility.Label"), Messages.getString ("Ui.Parameter.FriendlyModifierVisibility.Description"),"");
424
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
425
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
426
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
427
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
428
        parameter = enum_parameter;
429
        Group31.addParameter (parameter);
430
            enum_parameter = new EnumParameterModel(configuration,"PrivateAccessorVisibility", Messages.getString ("Ui.Parameter.PrivateAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.PrivateAccessorVisibility.Description"),"");
431
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
432
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
433
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
434
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
435
        parameter = enum_parameter;
436
        Group31.addParameter (parameter);
437
            enum_parameter = new EnumParameterModel(configuration,"PrivateModifierVisibility", Messages.getString ("Ui.Parameter.PrivateModifierVisibility.Label"), Messages.getString ("Ui.Parameter.PrivateModifierVisibility.Description"),"");
438
        enum_parameter.addItem("Public",Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
439
        enum_parameter.addItem("Protected",Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
440
        enum_parameter.addItem("Friendly",Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
441
        enum_parameter.addItem("Private",Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
442
        parameter = enum_parameter;
443
        Group31.addParameter (parameter);
383
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.INTERFACEIMPLEMENTATION, Messages.getString ("Ui.Parameter.InterfaceImplementation.Label"), Messages.getString ("Ui.Parameter.InterfaceImplementation.Description"),"");
384
            enum_parameter.addItem(JavaDesignerParameters.InterfaceImplementationMode.Ask.toString(), Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Ask"));
385
            enum_parameter.addItem(JavaDesignerParameters.InterfaceImplementationMode.Always.toString(), Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Always"));
386
            enum_parameter.addItem(JavaDesignerParameters.InterfaceImplementationMode.Never.toString(), Messages.getString ("Ui.Parameter.InterfaceImplementationMode.Never"));
387
            parameter = enum_parameter;
388
            Group31.addParameter (parameter);
389
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.ACCESSORSGENERATION, Messages.getString ("Ui.Parameter.AccessorsGeneration.Label"), Messages.getString ("Ui.Parameter.AccessorsGeneration.Description"),"");
390
            enum_parameter.addItem(JavaDesignerParameters.AccessorsGenerationMode.Always.toString(), Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Always"));
391
            enum_parameter.addItem(JavaDesignerParameters.AccessorsGenerationMode.Smart.toString(), Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Smart"));
392
            enum_parameter.addItem(JavaDesignerParameters.AccessorsGenerationMode.Never.toString(), Messages.getString ("Ui.Parameter.AccessorsGenerationMode.Never"));
393
            parameter = enum_parameter;
394
            Group31.addParameter (parameter);
395
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PUBLICACCESSORVISIBILITY, Messages.getString ("Ui.Parameter.PublicAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.PublicAccessorVisibility.Description"),"");
396
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
397
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
398
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
399
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
400
            parameter = enum_parameter;
401
            Group31.addParameter (parameter);
402
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PUBLICMODIFIERVISIBILITY, Messages.getString ("Ui.Parameter.PublicModifierVisibility.Label"), Messages.getString ("Ui.Parameter.PublicModifierVisibility.Description"),"");
403
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
404
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
405
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
406
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
407
            parameter = enum_parameter;
408
            Group31.addParameter (parameter);
409
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PROTECTEDACCESSORVISIBILITY, Messages.getString ("Ui.Parameter.ProtectedAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.ProtectedAccessorVisibility.Description"),"");
410
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
411
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
412
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
413
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
414
            parameter = enum_parameter;
415
            Group31.addParameter (parameter);
416
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PROTECTEDMODIFIERVISIBILITY, Messages.getString ("Ui.Parameter.ProtectedModifierVisibility.Label"), Messages.getString ("Ui.Parameter.ProtectedModifierVisibility.Description"),"");
417
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
418
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
419
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
420
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
421
            parameter = enum_parameter;
422
            Group31.addParameter (parameter);
423
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.FRIENDLYACCESSORVISIBILITY, Messages.getString ("Ui.Parameter.FriendlyAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.FriendlyAccessorVisibility.Description"),"");
424
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
425
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
426
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
427
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
428
            parameter = enum_parameter;
429
            Group31.addParameter (parameter);
430
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.FRIENDLYMODIFIERVISIBILITY, Messages.getString ("Ui.Parameter.FriendlyModifierVisibility.Label"), Messages.getString ("Ui.Parameter.FriendlyModifierVisibility.Description"),"");
431
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
432
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
433
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
434
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
435
            parameter = enum_parameter;
436
            Group31.addParameter (parameter);
437
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PRIVATEACCESSORVISIBILITY, Messages.getString ("Ui.Parameter.PrivateAccessorVisibility.Label"), Messages.getString ("Ui.Parameter.PrivateAccessorVisibility.Description"),"");
438
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
439
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
440
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
441
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
442
            parameter = enum_parameter;
443
            Group31.addParameter (parameter);
444
            enum_parameter = new EnumParameterModel(configuration, JavaDesignerParameters.PRIVATEMODIFIERVISIBILITY, Messages.getString ("Ui.Parameter.PrivateModifierVisibility.Label"), Messages.getString ("Ui.Parameter.PrivateModifierVisibility.Description"),"");
445
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Public.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Public"));
446
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Protected.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Protected"));
447
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Friendly.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Friendly"));
448
            enum_parameter.addItem(JavaDesignerParameters.AccessorVisibility.Private.toString(), Messages.getString ("Ui.Parameter.AccessorVisibility.Private"));
449
            parameter = enum_parameter;
450
            Group31.addParameter (parameter);
451

  
444 452
            ParameterGroupModel Group41 = new ParameterGroupModel("Group41", Messages.getString ("Ui.Parameter.Group41"));
445 453
            parameters.addGroup(Group41);
446
            parameter = new BoolParameterModel(configuration,"GeneratePrePostConditions", Messages.getString ("Ui.Parameter.GeneratePrePostConditions.Label"), Messages.getString ("Ui.Parameter.GeneratePrePostConditions.Description"),"");
447
        Group41.addParameter (parameter);
448
            parameter = new BoolParameterModel(configuration,"GenerateInvariants", Messages.getString ("Ui.Parameter.GenerateInvariants.Label"), Messages.getString ("Ui.Parameter.GenerateInvariants.Description"),"");
449
        Group41.addParameter (parameter);
450
            parameter = new StringParameterModel(configuration,"InvariantsName", Messages.getString ("Ui.Parameter.InvariantsName.Label"), Messages.getString ("Ui.Parameter.InvariantsName.Description"),"");
451
        Group41.addParameter (parameter);
454
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.GENERATEPREPOSTCONDITIONS, Messages.getString ("Ui.Parameter.GeneratePrePostConditions.Label"), Messages.getString ("Ui.Parameter.GeneratePrePostConditions.Description"),"");
455
            Group41.addParameter (parameter);
456
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.GENERATEINVARIANTS, Messages.getString ("Ui.Parameter.GenerateInvariants.Label"), Messages.getString ("Ui.Parameter.GenerateInvariants.Description"),"");
457
            Group41.addParameter (parameter);
458
            parameter = new StringParameterModel(configuration, JavaDesignerParameters.INVARIANTSNAME, Messages.getString ("Ui.Parameter.InvariantsName.Label"), Messages.getString ("Ui.Parameter.InvariantsName.Description"),"");
459
            Group41.addParameter (parameter);
460

  
452 461
            ParameterGroupModel Group51 = new ParameterGroupModel("Group51", Messages.getString ("Ui.Parameter.Group51"));
453 462
            parameters.addGroup(Group51);
454
            parameter = new BoolParameterModel(configuration,"UseExternalEdition", Messages.getString ("Ui.Parameter.UseExternalEdition.Label"), Messages.getString ("Ui.Parameter.UseExternalEdition.Description"),"");
455
        Group51.addParameter (parameter);
456
            parameter = new FileParameterModel(configuration,"ExternalEditorCommandLine", Messages.getString ("Ui.Parameter.ExternalEditorCommandLine.Label"), Messages.getString ("Ui.Parameter.ExternalEditorCommandLine.Description"),"");
457
        Group51.addParameter (parameter);
463
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.USEEXTERNALEDITION, Messages.getString ("Ui.Parameter.UseExternalEdition.Label"), Messages.getString ("Ui.Parameter.UseExternalEdition.Description"),"");
464
            Group51.addParameter (parameter);
465
            parameter = new FileParameterModel(configuration, JavaDesignerParameters.EXTERNALEDITORCOMMANDLINE, Messages.getString ("Ui.Parameter.ExternalEditorCommandLine.Label"), Messages.getString ("Ui.Parameter.ExternalEditorCommandLine.Description"),"");
466
            Group51.addParameter (parameter);
467

  
458 468
            ParameterGroupModel Group61 = new ParameterGroupModel("Group61", Messages.getString ("Ui.Parameter.Group61"));
459 469
            parameters.addGroup(Group61);
460
            parameter = new StringParameterModel(configuration,"CompilationOptions", Messages.getString ("Ui.Parameter.CompilationOptions.Label"), Messages.getString ("Ui.Parameter.CompilationOptions.Description"),"");
461
        Group61.addParameter (parameter);
462
            parameter = new BoolParameterModel(configuration,"UseJavah", Messages.getString ("Ui.Parameter.UseJavah.Label"), Messages.getString ("Ui.Parameter.UseJavah.Description"),"");
463
        Group61.addParameter (parameter);
464
            parameter = new StringParameterModel(configuration,"RunParameters", Messages.getString ("Ui.Parameter.RunParameters.Label"), Messages.getString ("Ui.Parameter.RunParameters.Description"),"");
465
        Group61.addParameter (parameter);
470
            parameter = new StringParameterModel(configuration, JavaDesignerParameters.COMPILATIONOPTIONS, Messages.getString ("Ui.Parameter.CompilationOptions.Label"), Messages.getString ("Ui.Parameter.CompilationOptions.Description"),"");
471
            Group61.addParameter (parameter);
472
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.USEJAVAH, Messages.getString ("Ui.Parameter.UseJavah.Label"), Messages.getString ("Ui.Parameter.UseJavah.Description"),"");
473
            Group61.addParameter (parameter);
474
            parameter = new StringParameterModel(configuration, JavaDesignerParameters.RUNPARAMETERS, Messages.getString ("Ui.Parameter.RunParameters.Label"), Messages.getString ("Ui.Parameter.RunParameters.Description"),"");
475
            Group61.addParameter (parameter);
476

  
466 477
            ParameterGroupModel Group71 = new ParameterGroupModel("Group71", Messages.getString ("Ui.Parameter.Group71"));
467 478
            parameters.addGroup(Group71);
468
            parameter = new BoolParameterModel(configuration,"GenerateJavadoc", Messages.getString ("Ui.Parameter.GenerateJavadoc.Label"), Messages.getString ("Ui.Parameter.GenerateJavadoc.Description"),"");
469
        Group71.addParameter (parameter);
470
            parameter = new BoolParameterModel(configuration,"DescriptionAsJavadoc", Messages.getString ("Ui.Parameter.DescriptionAsJavadoc.Label"), Messages.getString ("Ui.Parameter.DescriptionAsJavadoc.Description"),"");
471
        Group71.addParameter (parameter);
472
            parameter = new StringParameterModel(configuration,"JavaDocOptions", Messages.getString ("Ui.Parameter.JavaDocOptions.Label"), Messages.getString ("Ui.Parameter.JavaDocOptions.Description"),"");
473
        Group71.addParameter (parameter);
474
            parameter = new BoolParameterModel(configuration,"AutomaticallyOpenJavadoc", Messages.getString ("Ui.Parameter.AutomaticallyOpenJavadoc.Label"), Messages.getString ("Ui.Parameter.AutomaticallyOpenJavadoc.Description"),"");
475
        Group71.addParameter (parameter);
479
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.GENERATEJAVADOC, Messages.getString ("Ui.Parameter.GenerateJavadoc.Label"), Messages.getString ("Ui.Parameter.GenerateJavadoc.Description"),"");
480
            Group71.addParameter (parameter);
481
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.DESCRIPTIONASJAVADOC, Messages.getString ("Ui.Parameter.DescriptionAsJavadoc.Label"), Messages.getString ("Ui.Parameter.DescriptionAsJavadoc.Description"),"");
482
            Group71.addParameter (parameter);
483
            parameter = new StringParameterModel(configuration, JavaDesignerParameters.JAVADOCOPTIONS, Messages.getString ("Ui.Parameter.JavaDocOptions.Label"), Messages.getString ("Ui.Parameter.JavaDocOptions.Description"),"");
484
            Group71.addParameter (parameter);
485
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.AUTOMATICALLYOPENJAVADOC, Messages.getString ("Ui.Parameter.AutomaticallyOpenJavadoc.Label"), Messages.getString ("Ui.Parameter.AutomaticallyOpenJavadoc.Description"),"");
486
            Group71.addParameter (parameter);
487

  
476 488
            ParameterGroupModel Group81 = new ParameterGroupModel("Group81", Messages.getString ("Ui.Parameter.Group81"));
477 489
            parameters.addGroup(Group81);
478
            parameter = new BoolParameterModel(configuration,"PackageSrcInRamc", Messages.getString ("Ui.Parameter.PackageSrcInRamc.Label"), Messages.getString ("Ui.Parameter.PackageSrcInRamc.Description"),"");
479
        Group81.addParameter (parameter);
480
            parameter = new BoolParameterModel(configuration,"PackageJarInRamc", Messages.getString ("Ui.Parameter.PackageJarInRamc.Label"), Messages.getString ("Ui.Parameter.PackageJarInRamc.Description"),"");
481
        Group81.addParameter (parameter);
490
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.PACKAGESRCINRAMC, Messages.getString ("Ui.Parameter.PackageSrcInRamc.Label"), Messages.getString ("Ui.Parameter.PackageSrcInRamc.Description"),"");
491
            Group81.addParameter (parameter);
492
            parameter = new BoolParameterModel(configuration, JavaDesignerParameters.PACKAGEJARINRAMC, Messages.getString ("Ui.Parameter.PackageJarInRamc.Label"), Messages.getString ("Ui.Parameter.PackageJarInRamc.Description"),"");
493
            Group81.addParameter (parameter);
482 494
        }
483 495
        return this.parameterEditionModel;
484 496
    }
trunk/src/com/modeliosoft/modelio/javadesigner/i18n/messages_fr.properties
361 361
Ui.Parameter.FullNameGeneration.Label                = G\u00E9n\u00E9rer le nom complet pour les classes utilis\u00E9es
362 362
Ui.Parameter.GenDocPath.Description                  = R\u00E9pertoire de g\u00E9n\u00E9ration de la JavaDoc.
363 363
Ui.Parameter.GenDocPath.Label                        = R\u00E9pertoire de g\u00E9n\u00E9ration de la JavaDoc
364
Ui.Parameter.GenerateDefaultReturn.Description       = G\u00E9n\u00E9re un code de retour par d\u00E9faut pour les op\u00E9rations n'ayant ni notes 'code' ni notes 'return code'.
365
Ui.Parameter.GenerateDefaultReturn.Label             = G\u00E9n\u00E9rer code de retour par d\u00E9faut.
364 366
Ui.Parameter.GenerateFinalParameters.Description     = G\u00E9n\u00E9rer le mot cl\u00E9 java "final" pour tous les param\u00E8tres ayant un passage de param\u00E8tre indiquant "entr\u00E9e".
365 367
Ui.Parameter.GenerateFinalParameters.Label           = G\u00E9n\u00E9rer les param\u00E8tres d'entr\u00E9e en tant que "final".
366 368
Ui.Parameter.GenerateInvariants.Description          = Indique si les invariants doivent \u00EAtre g\u00E9n\u00E9r\u00E9es.
......
483 485
Warning.NonFinalClassInheritance             = La classe {0} ne peut h\u00E9riter de la classe {1} qui est finale. 
484 486
Warning.PluginPathNotDefined                 = Le r\u00E9pertoire de g\u00E9n\u00E9ration du plugin n''est pas d\u00E9fini pour le plugin {0}.
485 487
Warning.PrePostOnClass                       = La contrainte pr\u00E9-post condition de la classe {0} n''est pas prise en compte pour la g\u00E9n\u00E9ration Java. Placez les contraintes pr\u00E9-post conditions sur les op\u00E9rations.
488
Warning.ReturnCodeMissing                    = Code par d\u00E9faut g\u00E9n\u00E9r\u00E9 pour l''op\u00E9ration "{0}".
489
Warning.ReturnCodeMissingDescription         = Ajoutez une note "code" ou "return code" sur l'op\u00E9ration. \r\nLa g\u00E9n\u00E9ration de code par defaut peut aussi \u00EAtre d\u00E9sactiv\u00E9e dans les param\u00E8tres du module Java Designer.
486 490
Warning.TemplateParameterMultipleInheritance = La template parameter"{0}" ne peut sp\u00E9cialiser qu''une classe.
487 491
Warning.VolatileFinalAttribute               = L''attribut final {1} de la classe {0} ne peut \u00EAtre volatile. D\u00E9cochez les cases "Finale" ou "Volatile" en utilisant l''\u00E9diteur de propri\u00E9t\u00E9s.
488 492
Warning.WorkspaceNotDefined                  = Le r\u00E9pertoire de g\u00E9n\u00E9ration n''est pas d\u00E9fini pour le module {0}.
trunk/src/com/modeliosoft/modelio/javadesigner/i18n/messages.properties
384 384
Ui.Parameter.FullNameGeneration.Label                = Generate full name for used classes
385 385
Ui.Parameter.GenDocPath.Description                  = JavaDoc generation path.
386 386
Ui.Parameter.GenDocPath.Label                        = JavaDoc path
387
Ui.Parameter.GenerateDefaultReturn.Description       = Generates a default return code in operations having nor 'code' nor 'return code' notes.
388
Ui.Parameter.GenerateDefaultReturn.Label             = Generates default return code.  
387 389
Ui.Parameter.GenerateFinalParameters.Description     = Generates the "final" java keyword for all parameters having an "in" access mode.
388 390
Ui.Parameter.GenerateFinalParameters.Label           = Generate "in" parameters as "final".
389 391
Ui.Parameter.GenerateInvariants.Description          = Indicates invariants should be generated.
......
506 508
Warning.NonFinalClassInheritance             = The "{0}" class cannot specialize the "{1}" class, which is final.
507 509
Warning.PluginPathNotDefined                 = The plugin generation path is not defined for the {0} plugin.
508 510
Warning.PrePostOnClass                       = The constraint pre-post condition on the "{0}" class is not taken into account for Java generation. Place Constraints pre-post conditions on operations.
511
Warning.ReturnCodeMissing                    = Default return code generated for operation "{0}".
512
Warning.ReturnCodeMissingDescription         = Add a "code" or "return code" note on the operation. \r\nDefault code generation can also be deactivated in JavaDesigner's module parameters.
509 513
Warning.TemplateParameterMultipleInheritance = The "{0}" template parameter can only specialize one class.
510 514
Warning.VolatileFinalAttribute               = The final "{1}" attribute of the "{0}" class cannot be volatile. Delete the "JavaVolatile" tagged value  or uncheck the "Final" check box using the properties editor of the "{1}" attribute.
511 515
Warning.WorkspaceNotDefined                  = The module generation path is not defined for the {0} module.
trunk/src/com/modeliosoft/modelio/javadesigner/generator/JavaConfiguration.java
9 9

  
10 10
    public boolean ERRORONFIRSTWARNING;
11 11

  
12
    public boolean GENERATEDEFAULTRETURN;
13

  
12 14
    public boolean GENERATEFINALPARAMETERS;
13 15

  
14 16
    public boolean GENERATEINVARIANTS;
......
41 43
        
42 44
        this.DESCRIPTIONASJAVADOC = getBooleanParameterValue (JavaDesignerParameters.DESCRIPTIONASJAVADOC);
43 45
        this.ERRORONFIRSTWARNING = getBooleanParameterValue (JavaDesignerParameters.ERRORONFIRSTWARNING);
46
        this.GENERATEDEFAULTRETURN = getBooleanParameterValue (JavaDesignerParameters.GENERATEDEFAULTRETURN);
44 47
        this.GENERATEFINALPARAMETERS = getBooleanParameterValue (JavaDesignerParameters.GENERATEFINALPARAMETERS);
45 48
        this.GENERATEINVARIANTS = getBooleanParameterValue (JavaDesignerParameters.GENERATEINVARIANTS);
46 49
        this.GENERATEPREPOSTCONDITIONS = getBooleanParameterValue (JavaDesignerParameters.GENERATEPREPOSTCONDITIONS);
trunk/src/com/modeliosoft/modelio/javadesigner/generator/ClassTemplate.java
204 204
        return "";
205 205
    }
206 206

  
207
    private CharSequence computeBodyBottom(IOperation theOperation) {
207
    private CharSequence computeBodyBottom(IOperation theOperation) throws CustomException {
208 208
        StringBuilder ret = new StringBuilder ();
209 209

  
210 210
        ret.append (getTransformedOneNoteOfType (theOperation, "JavaReturned", this.javaConfig.GENERATIONMODE_MODELDRIVEN));
211 211

  
212
        if (ret.length () == 0 && (theOperation.getReturn () != null) &&
213
                this.javaConfig.GENERATIONMODE_MODELDRIVEN) {
212
        IParameter returnParam = theOperation.getReturn ();
213
        if (ret.length () == 0 && returnParam!= null) {
214
            if (this.javaConfig.GENERATIONMODE_MODELDRIVEN) {
214 215
            ret.append (computeEmptyMarker (theOperation, "JavaReturned"));
216
            } else if (theOperation.getNote("JavaCode") == null && this.javaConfig.GENERATEDEFAULTRETURN) {
217
                IGeneralClass returnType = returnParam.getType();
218
                String returnName = JavaDesignerUtils.getJavaName(returnType);
219
                
220
                if (JavaDesignerUtils.isPredefinedType(returnName) && !this.typeManager.isArray(returnParam)) {
221
                    ret.append (getCurrentIndent ());
222
                    ret.append("// TODO Auto-generated return");
223
                    ret.append(NL);
224
                    ret.append (getCurrentIndent ());
225
                    
226
                    switch (returnName) {
227
                        case JavaDesignerUtils.BOOLEAN:
228
                            ret.append("return false;");
229
                            break;
230
                        case JavaDesignerUtils.BYTE:
231
                        case JavaDesignerUtils.CHAR:
232
                        case JavaDesignerUtils.INTEGER:
233
                        case JavaDesignerUtils.DOUBLE:
234
                        case JavaDesignerUtils.LONG:
235
                        case JavaDesignerUtils.SHORT:
236
                            ret.append("return 0;");
237
                            break;
238
                        case JavaDesignerUtils.FLOAT:
239
                            ret.append("return 0f;");
240
                            break;
241
                        case JavaDesignerUtils.DATE:
242
                        case JavaDesignerUtils.STRING:
243
                        default:
244
                            ret.append("return null;");
245
                    }
246
                    
247
                    ret.append(NL);
248
                    
249
                    this.report.addWarning (Messages.getString ("Warning.ReturnCodeMissing", JavaDesignerUtils.getJavaName (theOperation)), theOperation, Messages.getString ("Warning.ReturnCodeMissingDescription"));
250
                }
251
            }
215 252
        }
216 253
        return ret;
217 254
    }

Also available in: Unified diff