- Sandbox-commits - mailman.cloud.codelutin.com

r607 - in testEugeneUML-YAML: testeugene testeugene/testpollen testeugene/testpollen/src/main/xmi testsnakeyaml testsnakeyaml/src/main/java
by agiraudet＠users.nuiton.org 03 May '13

03 May '13

Author: agiraudet Date: 2013-05-03 17:03:19 +0200 (Fri, 03 May 2013) New Revision: 607 Url: http://nuiton.org/projects/sandbox/repository/revisions/607 Log: ajout de la syntaxe pure yaml : uml5.yaml Added: testEugeneUML-YAML/testsnakeyaml/uml5.yaml Modified: testEugeneUML-YAML/testeugene/pom.xml testEugeneUML-YAML/testeugene/testpollen/pom.xml testEugeneUML-YAML/testeugene/testpollen/src/main/xmi/pollen.zargo testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java Modified: testEugeneUML-YAML/testeugene/pom.xml =================================================================== --- testEugeneUML-YAML/testeugene/pom.xml 2013-05-02 13:45:04 UTC (rev 606) +++ testEugeneUML-YAML/testeugene/pom.xml 2013-05-03 15:03:19 UTC (rev 607) @@ -20,12 +20,6 @@ <dependencies> <dependency> <groupId>org.nuiton.eugene</groupId> - <artifactId>eugene</artifactId> - <version>2.6.2</version> - </dependency> - - <dependency> - <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <version>2.6.2</version> </dependency> Modified: testEugeneUML-YAML/testeugene/testpollen/pom.xml =================================================================== --- testEugeneUML-YAML/testeugene/testpollen/pom.xml 2013-05-02 13:45:04 UTC (rev 606) +++ testEugeneUML-YAML/testeugene/testpollen/pom.xml 2013-05-03 15:03:19 UTC (rev 607) @@ -21,7 +21,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> <executions> <execution> <phase>generate-sources</phase> Modified: testEugeneUML-YAML/testeugene/testpollen/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Modified: testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-05-02 13:45:04 UTC (rev 606) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-05-03 15:03:19 UTC (rev 607) @@ -127,9 +127,11 @@ } public static void main (String[] args) throws IOException { - //new testsnakeyaml("uml4.yaml").afficher(); - //System.out.println(new testsnakeyaml("uml4.yaml").toString()); + // trouver nom pour l'extension + String diagram = "uml5.yaml"; + //new testsnakeyaml(diagram).afficher(); + System.out.println(new testsnakeyaml(diagram).toString()); // afficher arbre des objets // pattern composit - new testsnakeyaml("uml4.yaml").afficherClass(); + //new testsnakeyaml(diagram).afficherClass(); } } Added: testEugeneUML-YAML/testsnakeyaml/uml5.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/uml5.yaml (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/uml5.yaml 2013-05-03 15:03:19 UTC (rev 607) @@ -0,0 +1,320 @@ +%YAML 1.1 +--- +# syntaxe uml/yaml version 5 - pure YAML + +# http://yaml.org/ +# syntaxe semblable à l'ObjectModel XML +# améliorations possibles : - gestion de l'heritage multiple et de plusieurs parametres de retour pour les operations + +# liens utiles +# http://maven-site.nuiton.org/eugene/objectmodel/ObjectModel.png +# http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd + +# model +- name: String 1 +- version: String 0..1 +# package: ? + # * +- imports: + String: String + Date: java.util.Date + # * +- comments: + - String + - comment + # * +- tagValues: + String: String + key: value + +# * +- class: + # * + - stereotype: + - String + - stereotype + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - abstract: boolean 0..1 + - final: boolean 0..1 + # * + # besoin d'appliquer comments et tagValues aux superClasses ? + - superClasses: + - String + - superclass + # * + # besoin d'appliquer comments et tagValues aux superInterfaces ? + - superinterfaces: + - String + - superinterface + # * + - attribute: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 0..1 + - visibility: String 0..1 + - type: String 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + - associationType: String 0..1 + - minMultiplicity: Integer 0..1 + - maxMultiplicity: Integer 0..1 + - navigable: boolean 0..1 + - ordering: String 0..1 + - label: String 0..1 + # operation + # - comments - tagValues + - operation: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - visibility: String 0..1 + - abstract: boolean 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + # syntaxe des parametres ne permettant pas d'appliquer de tagValues/comments aux parametres + # optionnel + #- parameters: + # parameter1: type + # parameter2: type + # optionnel + #- returnParameter: + # - returnparameter1 + # - returnparameter2 + # * + - parameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + - name: String 0..1 + - returnParameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + +# interfaces +# * +- interface: + # * + - stereotype: + - String + - stereotype + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - abstract: boolean 0..1 + - final: boolean 0..1 + # * + # besoin d'appliquer comments et tagValues aux superClasses ? + - superClasses: + - String + - superclass + # * + # besoin d'appliquer comments et tagValues aux superInterfaces ? + - superinterfaces: + - String + - superinterface + # * + - attribute: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 0..1 + - visibility: String 0..1 + - type: String 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + - associationType: String 0..1 + - minMultiplicity: Integer 0..1 + - maxMultiplicity: Integer 0..1 + - navigable: boolean 0..1 + - ordering: String 0..1 + - label: String 0..1 + # operation + # - comments - tagValues + - operation: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - visibility: String 0..1 + - abstract: boolean 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + # syntaxe des parametres ne permettant pas d'appliquer de tagValues/comments aux parametres + # optionnel + #- parameters: + # parameter1: type + # parameter2: type + # optionnel + #- returnParameter: + # - returnparameter1 + # - returnparameter2 + # * + - parameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + - name: String 0..1 + - returnParameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + +# classifiers +# * +- classifier: + # * + - stereotype: + - String + - stereotype + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - abstract: boolean 0..1 + - final: boolean 0..1 + # * + # besoin d'appliquer comments et tagValues aux superClasses ? + - superClasses: + - String + - superclass + # * + # besoin d'appliquer comments et tagValues aux superInterfaces ? + - superinterfaces: + - String + - superinterface + # * + - attribute: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 0..1 + - visibility: String 0..1 + - type: String 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + - associationType: String 0..1 + - minMultiplicity: Integer 0..1 + - maxMultiplicity: Integer 0..1 + - navigable: boolean 0..1 + - ordering: String 0..1 + - label: String 0..1 + # operation + # - comments - tagValues + - operation: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - name: String 1 + - visibility: String 0..1 + - abstract: boolean 0..1 + - static: boolean 0..1 + - final: boolean 0..1 + # syntaxe des parametres ne permettant pas d'appliquer de tagValues/comments aux parametres + # optionnel + #- parameters: + # parameter1: type + # parameter2: type + # optionnel + #- returnParameter: + # - returnparameter1 + # - returnparameter2 + # * + - parameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + - name: String 0..1 + - returnParameter: + # * + - comments: + - String + - comment + # * + - tagValues: + String: String + key: value + - type: String 1 + +# enumerations

1 0

r606 - in testEugeneUML-YAML/testeugene: . src/main/java src/main/java/org src/main/java/org/nuiton src/main/java/org/nuiton/eugene src/main/java/org/nuiton/eugene/plugin src/main/java/org/nuiton/eugene/plugin/writer
by agiraudet＠users.nuiton.org 02 May '13

02 May '13

Author: agiraudet Date: 2013-05-02 15:45:04 +0200 (Thu, 02 May 2013) New Revision: 606 Url: http://nuiton.org/projects/sandbox/repository/revisions/606 Log: ajout de classes chainedfilewriter pour tests Added: testEugeneUML-YAML/testeugene/src/main/java/org/ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriter.java testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriterTmp.java Modified: testEugeneUML-YAML/testeugene/pom.xml Modified: testEugeneUML-YAML/testeugene/pom.xml =================================================================== --- testEugeneUML-YAML/testeugene/pom.xml 2013-04-30 15:19:11 UTC (rev 605) +++ testEugeneUML-YAML/testeugene/pom.xml 2013-05-02 13:45:04 UTC (rev 606) @@ -17,4 +17,25 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> + <dependencies> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>2.6.2</version> + </dependency> + + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>2.6.2</version> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> +  + <version>3.0.5</version> + </dependency> + </dependencies> + </project> \ No newline at end of file Added: testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriter.java =================================================================== --- testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriter.java (rev 0) +++ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriter.java 2013-05-02 13:45:04 UTC (rev 606) @@ -0,0 +1,319 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id: XmiChainedFileWriter.java 1079 2011-06-28 09:15:23Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-maven-plugin/src/main/java/or… $ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.eugene.plugin.writer; + +//import org.nuiton.eugene.models.object.ObjectModel; +//import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; +import org.nuiton.eugene.writer.WriterReport; +import org.nuiton.plugin.PluginHelper; +import org.nuiton.util.FasterCachedResourceResolver; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ResourceResolver; +//import org.xml.sax.Attributes; +//import org.xml.sax.SAXException; +//import org.xml.sax.helpers.DefaultHandler; + +//import javax.xml.parsers.ParserConfigurationException; +//import javax.xml.parsers.SAXParser; +//import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.net.URL; +import java.util.List; +import java.util.Map; + +/** + * Implentation pour les writer to type xmi (qui transforme du xmi via xsl + * vers du model). + * + * @author tchemit + * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="xmi" + * @since 2.0.0 + */ +public class YamlChainedFileWriter extends BaseChainedFileWriter { + + public static final String PROP_RESOLVER = "resolver"; + + public static final String PROP_FULL_PACKAGE_PATH = "fullPackagePath"; + + public static final String PROP_EXTRACTED_PACKAGES = "extraPackages"; + + public YamlChainedFileWriter() { + super(PROP_RESOLVER, + "resolver", + PROP_FULL_PACKAGE_PATH, + "fullPackagePath", + PROP_EXTRACTED_PACKAGES, + "extraPackages" + ); + } + + @Override + public boolean acceptModel(String modelType) { + // supported by objectModel and stateModel + return acceptObjectModelOrStateModel(modelType); + } + + @Override + public String getInputProtocol() { + return "yaml"; + } + + @Override + public String getOutputProtocol(String modelType) { + // next writer : write from model files + return "model"; + } + + @Override + public boolean acceptInclude(String include) { + return include.startsWith("yaml:") || include.endsWith(".yaml") || include.endsWith(".uml"); + } + + @Override + public String getDefaultIncludes() { + return "**/*.yaml"; + } + + @Override + public String getDefaultInputDirectory() { + return "src/main/yaml"; + } + + @Override + public String getDefaultOutputDirectory() { + return "models"; + } + + @Override + public String getDefaultTestInputDirectory() { + return "src/test/yaml"; + } + + @Override + public String getDefaultTestOutputDirectory() { + return "test-models"; + } + + protected TransformerFactory transformerFactory; + + protected TransformerFactory getTransformerFactory() { + if (transformerFactory == null) { + transformerFactory = TransformerFactory.newInstance(); + } + return transformerFactory; + } + + public String getFullPackagePath() { + return getProperty(PROP_FULL_PACKAGE_PATH, String.class); + } + + public String getExtractedPackages() { + return getProperty(PROP_EXTRACTED_PACKAGES, String.class); + } + + public String getResolver() { + return getProperty(PROP_RESOLVER, String.class); + } + + @Override + public void generate(ChainedFileWriterConfiguration configuration, + File outputDirectory, + Map<File, List<File>> filesByRoot, + Map<File, List<File>> resourcesByFile) throws IOException { + + /*if (configuration.isVerbose()) { + getLog().info(" with fullPackagePath : " + getFullPackagePath()); + getLog().info(" with resolver : " + getResolver()); + } + + for (Map.Entry<File, List<File>> entry : filesByRoot.entrySet()) { + File inputDirectory = entry.getKey(); + List<File> files = entry.getValue(); + + getLog().info("Processing XSL tranformation on " + + inputDirectory + " for " + files.size() + " file(s)."); + + for (File file : files) { + + // lancement des traitements xsl sur les fichiers trouvés + // dans le repertoire + boolean reacted = actionXsl(configuration, + outputDirectory, + inputDirectory, + file + ); + + if (!reacted) { + + // file was not treated, nothing else to do + continue; + } + + // copy resources associated with the file + copyResources(configuration, + outputDirectory, + inputDirectory, + file, + resourcesByFile + ); + + } + }*/ + } + + //remove\\ + /*protected boolean actionXsl(ChainedFileWriterConfiguration configuration, + File outputDirectory, + File inputDirectory, + File file) throws IOException { + + try { + if (getLog().isDebugEnabled()) { + getLog().debug("treate file : " + file); + } + // Prepare resolver, stylesheet + URIResolver fileResolver = getUriResolver(configuration, file); + String styleSheet = getStyleSheet(configuration.getModelType(), file); + URL xsl = Resource.getURL(styleSheet); + + String newExtension = configuration.getModelType(); + + // get the mirror file in the ouput root directory + File mirrorFile = FileUtil.getRelativeFile(inputDirectory, + outputDirectory, + file + ); + + // change the extension name to the modeltype + File result = FileUtil.changeExtension(mirrorFile, newExtension); + + if (!configuration.isOverwrite() && + file.lastModified() < result.lastModified()) { + + if (configuration.isVerbose()) { + getLog().info("Will not generate " + result + + " (up-to-date)."); + } + return false; + } + + PluginHelper.createDirectoryIfNecessary(result.getParentFile()); + WriterReport writerReport = getWriterReport(); + if (writerReport != null) { + + writerReport.addFile( + getClass().getName(), + result, + true + ); + } + + // Create the xsl transformer and set parameters + Transformer transformer = getTransformerFactory().newTransformer(new StreamSource(xsl.openStream())); + + transformer.setParameter(PROP_FULL_PACKAGE_PATH, + getFullPackagePath() + ); + transformer.setParameter(PROP_EXTRACTED_PACKAGES, + getExtractedPackages() + ); + + transformer.setURIResolver(fileResolver); + FileOutputStream output = new FileOutputStream(result); + try { + transformer.transform(new StreamSource(file), + new StreamResult(output)); + } finally { + output.close(); + } + return true; + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new IOException(e.getMessage(), e); + } + }*/ + + protected URIResolver getUriResolver( + ChainedFileWriterConfiguration configuration, File model) { + URIResolver result = null; + + try { + ClassLoader loader = configuration.getClassLoader(); + Class<?> clazz = Class.forName(getResolver(), true, loader); + + // Try to set the base using the constructor + try { + // Look for a constructor with a String parameter (base) + Constructor<?> withBaseConstructor = + clazz.getConstructor(String.class); + // Set the xmi folder as the base + String base = model.getParentFile().getAbsolutePath(); + // Instantiate + result = (URIResolver) withBaseConstructor.newInstance(base); + } catch (Exception eee) { + getLog().warn( + "Unable to instantiate resolver with String parameter", + eee); + } + + // If resolver is still not created, create it using the default + // constructor + if (result == null) { + result = (URIResolver) clazz.newInstance(); + } + + if (result instanceof ResourceResolver) { + ((ResourceResolver) result).setVerbose( + configuration.isVerbose()); + ((ResourceResolver) result).setCl(loader); + if (result instanceof FasterCachedResourceResolver) { + boolean offline = configuration.isOffline(); + if (getLog().isDebugEnabled()) { + getLog().debug("using offline mode ? : " + offline); + } + ((FasterCachedResourceResolver) result).setOffline(offline); + } + } + + } catch (Exception eee) { + getLog().warn("Unable to instantiate resolver using " + + "the default constructor", eee); + } + + return result; + } +} \ No newline at end of file Added: testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriterTmp.java =================================================================== --- testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriterTmp.java (rev 0) +++ testEugeneUML-YAML/testeugene/src/main/java/org/nuiton/eugene/plugin/writer/YamlChainedFileWriterTmp.java 2013-05-02 13:45:04 UTC (rev 606) @@ -0,0 +1,408 @@ +/* + * #%L + * EUGene :: Maven plugin + * + * $Id: XmiChainedFileWriter.java 1079 2011-06-28 09:15:23Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/eugene/trunk/eugene-maven-plugin/src/main/java/or… $ + * %% + * Copyright (C) 2006 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.eugene.plugin.writer; + +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.state.StateModel; +import org.nuiton.eugene.writer.ChainedFileWriterConfiguration; +import org.nuiton.eugene.writer.WriterReport; +import org.nuiton.plugin.PluginHelper; +import org.nuiton.util.FasterCachedResourceResolver; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Resource; +import org.nuiton.util.ResourceResolver; +import org.xml.sax.Attributes; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.URIResolver; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.net.URL; +import java.util.List; +import java.util.Map; + +/** + * Implentation pour les writer to type xmi (qui transforme du xmi via xsl + * vers du model). + * + * @author tchemit + * @plexus.component role="org.nuiton.eugene.writer.ChainedFileWriter" role-hint="xmi" + * @since 2.0.0 + */ +public class YamlChainedFileWriterTmp extends BaseChainedFileWriter { + + public static final String PROP_RESOLVER = "resolver"; + + public static final String PROP_FULL_PACKAGE_PATH = "fullPackagePath"; + + public static final String PROP_EXTRACTED_PACKAGES = "extraPackages"; + + public YamlChainedFileWriterTmp() { + super(PROP_RESOLVER, + "resolver", + PROP_FULL_PACKAGE_PATH, + "fullPackagePath", + PROP_EXTRACTED_PACKAGES, + "extraPackages" + ); + } + + @Override + public boolean acceptModel(String modelType) { + // supported by objectModel and stateModel + return acceptObjectModelOrStateModel(modelType); + } + + @Override + public String getInputProtocol() { + return "yaml"; + } + + @Override + public String getOutputProtocol(String modelType) { + // next writer : write from model files + return "model"; + } + + @Override + public boolean acceptInclude(String include) { + return include.startsWith("yaml:") || include.endsWith(".yaml") || include.endsWith(".uml"); + } + + @Override + public String getDefaultIncludes() { + return "**/*.yaml"; + } + + @Override + public String getDefaultInputDirectory() { + return "src/main/yaml"; + } + + @Override + public String getDefaultOutputDirectory() { + return "models"; + } + + @Override + public String getDefaultTestInputDirectory() { + return "src/test/yaml"; + } + + @Override + public String getDefaultTestOutputDirectory() { + return "test-models"; + } + + protected TransformerFactory transformerFactory; + + protected TransformerFactory getTransformerFactory() { + if (transformerFactory == null) { + transformerFactory = TransformerFactory.newInstance(); + } + return transformerFactory; + } + + public String getFullPackagePath() { + return getProperty(PROP_FULL_PACKAGE_PATH, String.class); + } + + public String getExtractedPackages() { + return getProperty(PROP_EXTRACTED_PACKAGES, String.class); + } + + public String getResolver() { + return getProperty(PROP_RESOLVER, String.class); + } + + @Override + public void generate(ChainedFileWriterConfiguration configuration, + File outputDirectory, + Map<File, List<File>> filesByRoot, + Map<File, List<File>> resourcesByFile) throws IOException { + + if (configuration.isVerbose()) { + getLog().info(" with fullPackagePath : " + getFullPackagePath()); + getLog().info(" with resolver : " + getResolver()); + } + + for (Map.Entry<File, List<File>> entry : filesByRoot.entrySet()) { + File inputDirectory = entry.getKey(); + List<File> files = entry.getValue(); + + getLog().info("Processing XSL tranformation on " + + inputDirectory + " for " + files.size() + " file(s)."); + + for (File file : files) { + + // lancement des traitements xsl sur les fichiers trouvés + // dans le repertoire + boolean reacted = actionXsl(configuration, + outputDirectory, + inputDirectory, + file + ); + + if (!reacted) { + + // file was not treated, nothing else to do + continue; + } + + // copy resources associated with the file + copyResources(configuration, + outputDirectory, + inputDirectory, + file, + resourcesByFile + ); + + } + } + } + + protected boolean actionXsl(ChainedFileWriterConfiguration configuration, + File outputDirectory, + File inputDirectory, + File file) throws IOException { + + try { + if (getLog().isDebugEnabled()) { + getLog().debug("treate file : " + file); + } + // Prepare resolver, stylesheet + URIResolver fileResolver = getUriResolver(configuration, file); + String styleSheet = + getStyleSheet(configuration.getModelType(), file); + URL xsl = Resource.getURL(styleSheet); + + String newExtension = configuration.getModelType(); + + // get the mirror file in the ouput root directory + File mirrorFile = FileUtil.getRelativeFile(inputDirectory, + outputDirectory, + file + ); + + // change the extension name to the modeltype + File result = FileUtil.changeExtension(mirrorFile, newExtension); + + if (!configuration.isOverwrite() && + file.lastModified() < result.lastModified()) { + + if (configuration.isVerbose()) { + getLog().info("Will not generate " + result + + " (up-to-date)."); + } + return false; + } + + PluginHelper.createDirectoryIfNecessary(result.getParentFile()); + WriterReport writerReport = getWriterReport(); + if (writerReport != null) { + + writerReport.addFile( + getClass().getName(), + result, + true + ); + } + + // Create the xsl transformer and set parameters + Transformer transformer = getTransformerFactory(). + newTransformer(new StreamSource(xsl.openStream())); + + transformer.setParameter(PROP_FULL_PACKAGE_PATH, + getFullPackagePath() + ); + transformer.setParameter(PROP_EXTRACTED_PACKAGES, + getExtractedPackages() + ); + + transformer.setURIResolver(fileResolver); + FileOutputStream output = new FileOutputStream(result); + try { + transformer.transform(new StreamSource(file), + new StreamResult(output)); + } finally { + output.close(); + } + return true; + } catch (IOException e) { + throw e; + } catch (Exception e) { + throw new IOException(e.getMessage(), e); + } + } + + protected URIResolver getUriResolver( + ChainedFileWriterConfiguration configuration, File model) { + URIResolver result = null; + + try { + ClassLoader loader = configuration.getClassLoader(); + Class<?> clazz = Class.forName(getResolver(), true, loader); + + // Try to set the base using the constructor + try { + // Look for a constructor with a String parameter (base) + Constructor<?> withBaseConstructor = + clazz.getConstructor(String.class); + // Set the xmi folder as the base + String base = model.getParentFile().getAbsolutePath(); + // Instantiate + result = (URIResolver) withBaseConstructor.newInstance(base); + } catch (Exception eee) { + getLog().warn( + "Unable to instantiate resolver with String parameter", + eee); + } + + // If resolver is still not created, create it using the default + // constructor + if (result == null) { + result = (URIResolver) clazz.newInstance(); + } + + if (result instanceof ResourceResolver) { + ((ResourceResolver) result).setVerbose( + configuration.isVerbose()); + ((ResourceResolver) result).setCl(loader); + if (result instanceof FasterCachedResourceResolver) { + boolean offline = configuration.isOffline(); + if (getLog().isDebugEnabled()) { + getLog().debug("using offline mode ? : " + offline); + } + ((FasterCachedResourceResolver) result).setOffline(offline); + } + } + + } catch (Exception eee) { + getLog().warn("Unable to instantiate resolver using " + + "the default constructor", eee); + } + + return result; + } + + protected String getStyleSheet(String modelType, File model) { + if (ObjectModel.NAME.equals(modelType)) { + String version = getXmiVersion(model); + String styleSheet = null; + if (version.startsWith("1.")) { + styleSheet = "xmi1.2ToObjectModel.xsl"; + } else if (version.startsWith("2.")) { + styleSheet = "xmi2.1ToObjectModel.xsl"; + } else { + getLog().error("Unsupported xmi version [" + version + "]"); + } + return styleSheet; + } + if (StateModel.NAME.equals(modelType)) { + //TODO when StateModel will be supported in 2.1, compute the version to resolve the correct stylesheet + return "xmi1.2ToStateModel.xsl"; + } + + throw new IllegalStateException("unsupported modelType [" + + modelType + "]"); + } + + /** + * Try to find xmi version on a file. + * + * @param xmiFile file to inspect + * @return version or null if version can't have been found + */ + protected String getXmiVersion(File xmiFile) { + String version = null; + + SAXParserFactory factory = SAXParserFactory.newInstance(); + + try { + SAXParser parser = factory.newSAXParser(); + + XmiVersionHandler handler = new XmiVersionHandler(); + parser.parse(xmiFile, handler); + + version = handler.getVersion(); + } catch (ParserConfigurationException e) { + getLog().debug("Can't parse file as xmi", e); + } catch (SAXException e) { + getLog().debug("Can't parse file as xmi", e); + } catch (IOException e) { + getLog().debug("Can't parse file as xmi", e); + } + + return version; + } + + /** Sax handler to find xmi version into xmi document. */ + protected class XmiVersionHandler extends DefaultHandler { + + protected String version; + + public XmiVersionHandler() { + } + + public String getVersion() { + return version; + } + + @Override + public void startElement(String uri, + String localName, + String qName, + Attributes attributes) throws SAXException { + + if (qName.equals("XMI")) { + version = attributes.getValue("xmi.version"); + if (getLog().isDebugEnabled()) { + getLog().debug("XMI version found : " + version); + } + } + + if (version == null) { + version = attributes.getValue("xmi:version"); + if (getLog().isDebugEnabled()) { + getLog().debug("XMI version found : " + version); + } + } + + } + } + + +} \ No newline at end of file

1 0

r605 - hibernate-HHH-8109
by athimel＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: athimel Date: 2013-04-30 17:19:11 +0200 (Tue, 30 Apr 2013) New Revision: 605 Url: http://nuiton.org/projects/sandbox/repository/revisions/605 Log: Test now runs successfully with Hibernate 4.2.1.Final Modified: hibernate-HHH-8109/pom.xml Modified: hibernate-HHH-8109/pom.xml =================================================================== --- hibernate-HHH-8109/pom.xml 2013-04-30 10:20:18 UTC (rev 604) +++ hibernate-HHH-8109/pom.xml 2013-04-30 15:19:11 UTC (rev 605) @@ -73,7 +73,7 @@   - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> </properties> <packaging>jar</packaging>

1 0

r604 - in testEugeneUML-YAML/testsnakeyaml: . src/main/java
by agiraudet＠users.nuiton.org 30 Apr '13

30 Apr '13

Author: agiraudet Date: 2013-04-30 12:20:18 +0200 (Tue, 30 Apr 2013) New Revision: 604 Url: http://nuiton.org/projects/sandbox/repository/revisions/604 Log: correction du fichier uml4.yaml (ne pouvais pas etre parse correctement) et ajout d'une methode affichant l'arbre des type des objets d'un document yaml (parcourirClass:testsnakeyaml.java) Modified: testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java testEugeneUML-YAML/testsnakeyaml/uml4.yaml Modified: testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-04-29 15:50:54 UTC (rev 603) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-04-30 10:20:18 UTC (rev 604) @@ -6,6 +6,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.Map; // http://code.google.com/p/snakeyaml/wiki/Documentation @@ -65,6 +66,61 @@ } } + public static void parcourirClass(Object obj, String indent, int type) + { + if(obj instanceof Map.Entry) + { + parcourirClass(((Map.Entry) obj).getKey(), indent + " ",1); + parcourirClass(((Map.Entry) obj).getValue(), indent + " ",2); + } + else if(obj instanceof Map) + { + afficherClass(obj,indent,type); + parcourirClass(((Map) obj).entrySet(), indent + " ",0); + } + else if (obj instanceof Iterable) + { + afficherClass(obj,indent,type); + for (Object tmp : (Iterable) obj) + { + parcourirClass(tmp, indent + " ",0); + } + } + else + { + afficherClass(obj,indent,type); + } + } + + public void afficherClass() + { + this.parcourirClass(this.data,"",0); + + } + + public static void afficherClass(Object obj, String indent, int type) + { + if (obj == null) + { + System.out.println(indent+"null"); + } + else + { + if(type == 1) + { + System.out.println(indent+"[KEY] "+obj.getClass()); + } + else if(type == 2) + { + System.out.println(indent+"[VALUE] "+obj.getClass()); + } + else + { + System.out.println(indent+obj.getClass()); + } + } + } + public String toString() { return this.yaml.dump(this.data); @@ -72,6 +128,8 @@ public static void main (String[] args) throws IOException { //new testsnakeyaml("uml4.yaml").afficher(); - System.out.println(new testsnakeyaml("uml4.yaml").toString()); + //System.out.println(new testsnakeyaml("uml4.yaml").toString()); + // afficher arbre des objets // pattern composit + new testsnakeyaml("uml4.yaml").afficherClass(); } } Modified: testEugeneUML-YAML/testsnakeyaml/uml4.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/uml4.yaml 2013-04-29 15:50:54 UTC (rev 603) +++ testEugeneUML-YAML/testsnakeyaml/uml4.yaml 2013-04-30 10:20:18 UTC (rev 604) @@ -43,8 +43,8 @@ - String chaine - Classe4 [0..*] [label1] - tagvalues: - key1: value1 - key2: value2 + key1: value1 + key2: value2 - coments: - comment1 - comment2

1 0

r603 - testEugeneUML-YAML
by agiraudet＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: agiraudet Date: 2013-04-29 17:50:54 +0200 (Mon, 29 Apr 2013) New Revision: 603 Url: http://nuiton.org/projects/sandbox/repository/revisions/603 Log: mise a jour du document recherche_syntaxe_uml-yaml.pdf Modified: testEugeneUML-YAML/recherche_syntaxe_uml-yaml.pdf Modified: testEugeneUML-YAML/recherche_syntaxe_uml-yaml.pdf =================================================================== (Binary files differ)

1 0

r602 - in testEugeneUML-YAML: . testeugene/testpollen/src/main/xmi
by agiraudet＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: agiraudet Date: 2013-04-29 17:22:49 +0200 (Mon, 29 Apr 2013) New Revision: 602 Url: http://nuiton.org/projects/sandbox/repository/revisions/602 Log: ajout du document recherche_syntaxe_uml-yaml.pdf expliquant la syntaxe uml4.yaml Added: testEugeneUML-YAML/recherche_syntaxe_uml-yaml.pdf Modified: testEugeneUML-YAML/testeugene/testpollen/src/main/xmi/pollen.zargo Added: testEugeneUML-YAML/recherche_syntaxe_uml-yaml.pdf =================================================================== (Binary files differ) Property changes on: testEugeneUML-YAML/recherche_syntaxe_uml-yaml.pdf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: testEugeneUML-YAML/testeugene/testpollen/src/main/xmi/pollen.zargo =================================================================== (Binary files differ)

1 0

r601 - in testEugeneUML-YAML/testsnakeyaml: . src/main/java
by agiraudet＠users.nuiton.org 29 Apr '13

29 Apr '13

Author: agiraudet Date: 2013-04-29 12:50:09 +0200 (Mon, 29 Apr 2013) New Revision: 601 Url: http://nuiton.org/projects/sandbox/repository/revisions/601 Log: ajout d'un exemple concret de la syntaxe uml4.yaml : diagram1.yaml diagram1.png Added: testEugeneUML-YAML/testsnakeyaml/diagram1.png testEugeneUML-YAML/testsnakeyaml/diagram1.yaml Modified: testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java testEugeneUML-YAML/testsnakeyaml/uml4.yaml Added: testEugeneUML-YAML/testsnakeyaml/diagram1.png =================================================================== (Binary files differ) Property changes on: testEugeneUML-YAML/testsnakeyaml/diagram1.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: testEugeneUML-YAML/testsnakeyaml/diagram1.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/diagram1.yaml (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/diagram1.yaml 2013-04-29 10:50:09 UTC (rev 601) @@ -0,0 +1,54 @@ +%YAML 1.1 +--- +# syntaxe uml/yaml version 4 + +# http://yaml.org/ +# http://laurent-audibert.developpez.com/Cours-UML/html/Cours-UML014.html +# astuce : utiliser la coloration syntaxique sh/bash +# attention a l'indentation ! + +# exemple +# objectif de la syntaxe : proche de l'ObjectModel + +# en-tête du document + +interface Interface1: + - operation1() + +class Classe1: + - interfaces: + - Interface1 + - Classe2 + - Classe4 + +class Classe2: + - interfaces: + - Interface1 + - Classe1 + - Classe4 composite [0..*] + +association Classe3: + - participants: + - Classe1 + - Classe2 + - Integer entier + +class Classe4: + - superclasses: + - Classe1 + - Classe2 + - Classe5 [1..*] [label1] + +class Classe5: + - String chaine + - Classe4 [0..*] [label1] + - tagvalues: + key1: value1 + key2: value2 + - coments: + - comment1 + - comment2 + +# regle1 : si un label et une seule multiplicité sont présents, alors l'association est bidirectionnelle +# regle2 : si un label et deux multiplicités sont présents, alors l'association et unidirectionnelle (le label est alors indicatif) +# regle3 : si on veut préciser un label pour une relation unidirectionnelle, il faut préciser les deux multiplicités de la relation Modified: testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-04-25 20:22:15 UTC (rev 600) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/testsnakeyaml.java 2013-04-29 10:50:09 UTC (rev 601) @@ -13,6 +13,11 @@ // http://www.google.fr/search?q=filetype%3Ayaml public class testsnakeyaml { + + class toto{ //inner class + + } + private Yaml yaml; private Object data; @@ -66,7 +71,7 @@ } public static void main (String[] args) throws IOException { - new testsnakeyaml("uml2.yaml").afficher(); - //new testsnakeyaml("uml2.yaml").toString(); + //new testsnakeyaml("uml4.yaml").afficher(); + System.out.println(new testsnakeyaml("uml4.yaml").toString()); } } Modified: testEugeneUML-YAML/testsnakeyaml/uml4.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/uml4.yaml 2013-04-25 20:22:15 UTC (rev 600) +++ testEugeneUML-YAML/testsnakeyaml/uml4.yaml 2013-04-29 10:50:09 UTC (rev 601) @@ -3,58 +3,52 @@ # syntaxe uml/yaml version 4 # http://yaml.org/ +# http://laurent-audibert.developpez.com/Cours-UML/html/Cours-UML014.html # astuce : utiliser la coloration syntaxique sh/bash # attention a l'indentation ! # exemple # objectif de la syntaxe : proche de l'ObjectModel -# association bidirectionnelle : c'est le mal -# visibilité optionnelle +# en-tête du document -class Classe1 <<entity>>: - - String chaine - - Integer entier - - String toString() - - Integer operation1(String input) -# "nom de l'attribut" "multiplicité" {type de lien} "multiplicité" "classe cible" -# exemple syntaxe modsl: -# 0->1(PollCommentVisibility); -# etudier navigabilité : si lien pas navigable, inutile de referencer l'autre classe (fait lors du traitement) -# types de relations : uni-directionnel, bi-directionnel, composition, agregation -# unidirectionnel - - attribut1 --> 1..3 Classe1 - - attribut1 -> 1..3 Classe1 -# bidirectionnel - - attribut2 --- Classe1 - - attribut2 -- Classe1 -# composition - - attribut3 <*>- - - attribut3 *- - - attribut3 <*>-> - - attribut3 *-> -# agregation - - attribut2 <o>- - - attribut2 o- - - attribut2 <o>-> - - attribut2 o-> +interface Interface1: + - operation1() -interface Interface1 <<entity>>: - - Integer entier - - String toString() +class Classe1: + - interfaces: + - Interface1 + - Classe2 + - Classe4 -enumeration Enumeration1 <<entity>>: - - Integer entier - - String toString() +class Classe2: + - interfaces: + - Interface1 + - Classe1 + - Classe4 composite [0..*] -# associationClass ou association -association AssociationClasse1: - - int attribut - - String toString() -# puis les classes cibles - - Classe1 - - Classe2 - - Classe3 +association Classe3: + - participants: + - Classe1 + - Classe2 + - Integer entier -class Classe2 extends Classe1 implements Interface1 - - . \ No newline at end of file +class Classe4: + - superclasses: + - Classe1 + - Classe2 + - Classe5 [1..*] [label1] + +class Classe5: + - String chaine + - Classe4 [0..*] [label1] + - tagvalues: + key1: value1 + key2: value2 + - coments: + - comment1 + - comment2 + +# regle1 : si un label et une seule multiplicité sont présents, alors l'association est bidirectionnelle +# regle2 : si un label et deux multiplicités sont présents, alors l'association et unidirectionnelle (le label est alors indicatif) +# regle3 : si on veut préciser un label pour une relation unidirectionnelle, il faut préciser les deux multiplicités de la relation

1 0

r600 - in jfxwvpoc/src: html org/codelutin/test
by echatellier＠users.nuiton.org 25 Apr '13

25 Apr '13

Author: echatellier Date: 2013-04-25 22:22:15 +0200 (Thu, 25 Apr 2013) New Revision: 600 Url: http://nuiton.org/projects/sandbox/repository/revisions/600 Log: Add sample about intercepting url to link ajax with java code Modified: jfxwvpoc/src/html/index.html jfxwvpoc/src/org/codelutin/test/Main.java Modified: jfxwvpoc/src/html/index.html =================================================================== --- jfxwvpoc/src/html/index.html 2013-04-24 15:55:37 UTC (rev 599) +++ jfxwvpoc/src/html/index.html 2013-04-25 20:22:15 UTC (rev 600) @@ -95,6 +95,24 @@ -webkit-transform:translateY(-90px) rotateX(-90deg); } </style> + + <script type="text/javascript"> + + function testAlert() { + + var xhr = new XMLHttpRequest(); + alert(xhr); + xhr.open("GET", "http://whatever/jtimer/getTasks", true); + + xhr.onreadystatechange = function() { + if (xhr.readyState == 4 && (xhr.status == 200 || xhr.status == 0)) { + alert(xhr.responseText); + } + }; + xhr.send(null); + } + + </script> </head> <body> @@ -105,6 +123,8 @@ Jtimer : <input type="button" value="Run 3D" onClick="this.parentNode.setAttribute('class', 'main mainanim');" /> <input type="button" value="Stop 3D" onClick="this.parentNode.setAttribute('class', 'main');" /><br /> + Ajaxs : <input type="button" value="Test Ajax" onClick="testAlert();" /> + <form> Date picker : <input type="date" name="toto" autofocus="autofocus" /><br /> Search : <input type="search" placeholder="Recherche" name="recherche" /><br /> Modified: jfxwvpoc/src/org/codelutin/test/Main.java =================================================================== --- jfxwvpoc/src/org/codelutin/test/Main.java 2013-04-24 15:55:37 UTC (rev 599) +++ jfxwvpoc/src/org/codelutin/test/Main.java 2013-04-25 20:22:15 UTC (rev 600) @@ -17,15 +17,25 @@ package org.codelutin.test; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.net.URLStreamHandlerFactory; +import javax.swing.JOptionPane; + import javafx.application.Application; +import javafx.event.EventHandler; import javafx.geometry.HPos; import javafx.geometry.VPos; import javafx.scene.Scene; import javafx.scene.layout.Region; import javafx.scene.paint.Color; import javafx.scene.web.WebEngine; +import javafx.scene.web.WebEvent; import javafx.scene.web.WebView; import javafx.stage.Stage; @@ -60,6 +70,51 @@ URL url = getClass().getResource("/html/index.html"); webEngine.load(url.toExternalForm()); getChildren().add(browser); + + webEngine.setOnAlert(new EventHandler<WebEvent<String>>(){ + @Override + public void handle(WebEvent<String> we) { + JOptionPane.showMessageDialog(null, we.getData()); + } + }); + + // override + URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory() { + @Override + public URLStreamHandler createURLStreamHandler(String protocol) { + + if ("http".equals(protocol)) { + // TODO try to fix restricted api + return new sun.net.www.protocol.http.Handler() { + + public URLConnection openConnection(URL url) throws IOException { + + String query = url.getPath(); + System.out.println(url); + if (query != null && query.startsWith("/jtimer/")) { + return new URLConnection(url) { + @Override + public void connect() throws IOException { + // heu + } + + public InputStream getInputStream() throws IOException { + + InputStream is = null; + String content = "Non mais allo quoi !"; + is = new ByteArrayInputStream(content.getBytes()); + return is; + } + }; + } else { + return super.openConnection(url); + } + } + }; + } + return null; // back to default handler + } + }); } @Override

1 0

r599 - in testEugeneUML-YAML/testsnakeyaml: . src/main/java src/main/java/model
by agiraudet＠users.nuiton.org 24 Apr '13

24 Apr '13

Author: agiraudet Date: 2013-04-24 17:55:37 +0200 (Wed, 24 Apr 2013) New Revision: 599 Url: http://nuiton.org/projects/sandbox/repository/revisions/599 Log: ajout d'une nouvelle syntaxe uml/yaml : uml4.yaml, plus proche de l'objectmodel Added: testEugeneUML-YAML/testsnakeyaml/src/main/java/model/ testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Model.java testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Uml3.java testEugeneUML-YAML/testsnakeyaml/uml4.yaml Modified: testEugeneUML-YAML/testsnakeyaml/uml3.yaml Added: testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Model.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Model.java (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Model.java 2013-04-24 15:55:37 UTC (rev 599) @@ -0,0 +1,5 @@ +package model; + +public class Model { + +} Added: testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Uml3.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Uml3.java (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/model/Uml3.java 2013-04-24 15:55:37 UTC (rev 599) @@ -0,0 +1,223 @@ +package model; + +import org.yaml.snakeyaml.Yaml; + +import java.io.*; +import java.util.*; + +import static parser.Parser.*; + +// classe permettant de parser la syntaxe uml3 +// uml3.yaml -> objectmodel.xml + +// http://cui.unige.ch/java/JAVAF/ +// equivalent dtd ? : http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd +/* +- classes, interfaces et enumerations : +abstract | public protected private | class interface enumeration | extends implements +- attributs +static | final +- methodes +public protected private | static | final | abstract +*/ +// final not implemented yet + +public class Uml3 { + public static void main(String[] args) throws IOException { + //debut chargement fichier + InputStream input = new FileInputStream(new File("uml3.yaml")); + Yaml yaml = new Yaml(); + Object data = yaml.load(input); + input.close(); + //fin chargement fichier + + //debut ecriture fichier + FileWriter model = new FileWriter("/tmp/test.objectmodel"); + String nameModel = ""; + String versionModel = ""; + model.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<objectModel xmlns=\"http://nuiton.org/eugene/objectModel/v1\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://nuiton.org/eugene/objectModel/v1 http://maven-site.nuiton.org/eugene/xsd/v1/objectmodel.xsd\" name=\""+nameModel+"\" version=\""+versionModel+"\">\n"); + + if(data instanceof Map) + { + for(Object e : ((Map) data).entrySet())// les classes et autres + { + if(e instanceof Map.Entry) + { + if (((Map.Entry) e).getKey() instanceof String && ((Map.Entry) e).getValue() instanceof ArrayList) + { + Map<String, Object> tmp = parseClass((String) ((Map.Entry) e).getKey()); + String type = (String) tmp.get("type"); + String name = (String) tmp.get("name"); + + model.write(" <"+type+" name=\""+name+"\" package=\""+"\">\n"); + if(tmp.containsKey("stereotype")) + { + String stereotype = (String) tmp.get("stereotype"); + model.write(" <stereotype name=\""+stereotype+"\"/>\n"); + } + + model.write(" </"+type+">\n"); + } + } + } + } + + //fin ecriture fichier + model.write("\n</objectModel>"); + model.close(); + } + + //OK + public static Map<String, Object> parseClass(String clazz) + { + LinkedList<String> tmp = new LinkedList<String>(spaceParse(clazz)); + Map<String, Object> res = new LinkedHashMap<String, Object>(); + + int index; + //stereotype + if(tmp.contains("<<entity>>")) + { + res.put("stereotype","entity"); + } + //abstraite + if(tmp.contains("abstract")) + { + res.put("abstract",true); + } + //visibilite + if(tmp.contains("public")) + { + res.put("visibility","protected"); + } + else if(tmp.contains("protected")) + { + res.put("visibility", "protected"); + } + else if(tmp.contains("private")) + { + res.put("visibility", "private"); + } + //type + if(tmp.contains("class")) + { + index = tmp.indexOf("class"); + res.put("type","class"); + res.put("name",tmp.get(index+1)); + } + else if(tmp.contains("interface")) + { + index = tmp.indexOf("interface"); + res.put("type","interface"); + res.put("name",tmp.get(index + 1)); + } + else if(tmp.contains("enum"))// ou enumeration ? + { + index = tmp.indexOf("enum"); + res.put("type","enum"); + res.put("name",tmp.get(index+1)); + } + //etend + List<String> extend = new LinkedList<String>(); + while(tmp.contains("extends")) + { + index = tmp.indexOf("extends"); + extend.add(tmp.get(index+1)); + tmp.remove(index); + } + res.put("extends",extend); + //implemente + List<String> implement = new LinkedList<String>(); + while(tmp.contains("implements")) + { + index = tmp.indexOf("implements"); + implement.add(tmp.get(index+1)); + tmp.remove(index); + } + res.put("implements",implement); + + return res; + } + + /*public static void parseClass(ArrayList tab) + { + for(Object obj : tab) + { + if(obj instanceof String) + { + if(((String) obj).contains("(") && ((String) obj).contains(")")) + { + parseOperation((String) obj); + } + else + { + parseAttribute((String) obj); + } + } + } + }*/ + + //PAS OK + /*public static List<PairBean<String, String>> parseOperation(String str) + { + LinkedList<String> tmp = new LinkedList<String>(spaceParse(beforeChar(str,'('))); + LinkedList<PairBean<String, String>> res = new LinkedList<PairBean<String, String>>(); + + //statique + if(tmp.contains("static")) + { + res.add(new PairBean<String, String>("static","static")); + } + //abstraite + if(tmp.contains("abstract")) + { + res.add(new PairBean<String, String>("abstract","abstract")); + } + //visibilite + if(tmp.contains("public")) + { + res.add(new PairBean<String, String>("visibility","public")); + } + else if(tmp.contains("protected")) + { + res.add(new PairBean<String, String>("visibility","protected")); + } + else if(tmp.contains("private")) + { + res.add(new PairBean<String, String>("visibility","private")); + } + + return res; + }*/ + + //OK + public static Map<String, Object> parseAttribute(String str) + { + LinkedList<String> tmp = new LinkedList<String>(spaceParse(str)); + Map<String, Object> res = new LinkedHashMap<String, Object>(); + + //statique + if(tmp.contains("static")) + { + res.put("static",true); + } + //visibilite + if(tmp.contains("public")) + { + res.put("visibility","public"); + } + else if(tmp.contains("protected")) + { + res.put("visibility","protected"); + } + else if(tmp.contains("private")) + { + res.put("visibility","private"); + } + // tenir compte de l'ordre :s + res.put("name",tmp.getLast()); + tmp.removeLast(); + res.put("type",tmp.getLast()); + + return res; + } +} Modified: testEugeneUML-YAML/testsnakeyaml/uml3.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/uml3.yaml 2013-04-24 13:33:57 UTC (rev 598) +++ testEugeneUML-YAML/testsnakeyaml/uml3.yaml 2013-04-24 15:55:37 UTC (rev 599) @@ -1,6 +1,6 @@ %YAML 1.1 --- -# syntaxe uml/yaml version 2 +# syntaxe uml/yaml version 3 # http://yaml.org/ # astuce : utiliser la coloration syntaxique sh/bash Added: testEugeneUML-YAML/testsnakeyaml/uml4.yaml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/uml4.yaml (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/uml4.yaml 2013-04-24 15:55:37 UTC (rev 599) @@ -0,0 +1,60 @@ +%YAML 1.1 +--- +# syntaxe uml/yaml version 4 + +# http://yaml.org/ +# astuce : utiliser la coloration syntaxique sh/bash +# attention a l'indentation ! + +# exemple +# objectif de la syntaxe : proche de l'ObjectModel + +# association bidirectionnelle : c'est le mal +# visibilité optionnelle + +class Classe1 <<entity>>: + - String chaine + - Integer entier + - String toString() + - Integer operation1(String input) +# "nom de l'attribut" "multiplicité" {type de lien} "multiplicité" "classe cible" +# exemple syntaxe modsl: +# 0->1(PollCommentVisibility); +# etudier navigabilité : si lien pas navigable, inutile de referencer l'autre classe (fait lors du traitement) +# types de relations : uni-directionnel, bi-directionnel, composition, agregation +# unidirectionnel + - attribut1 --> 1..3 Classe1 + - attribut1 -> 1..3 Classe1 +# bidirectionnel + - attribut2 --- Classe1 + - attribut2 -- Classe1 +# composition + - attribut3 <*>- + - attribut3 *- + - attribut3 <*>-> + - attribut3 *-> +# agregation + - attribut2 <o>- + - attribut2 o- + - attribut2 <o>-> + - attribut2 o-> + +interface Interface1 <<entity>>: + - Integer entier + - String toString() + +enumeration Enumeration1 <<entity>>: + - Integer entier + - String toString() + +# associationClass ou association +association AssociationClasse1: + - int attribut + - String toString() +# puis les classes cibles + - Classe1 + - Classe2 + - Classe3 + +class Classe2 extends Classe1 implements Interface1 + - . \ No newline at end of file

1 0

r598 - in testEugeneUML-YAML/testsnakeyaml: . src/main/java src/main/java/parser
by agiraudet＠users.nuiton.org 24 Apr '13

24 Apr '13

Author: agiraudet Date: 2013-04-24 15:33:57 +0200 (Wed, 24 Apr 2013) New Revision: 598 Url: http://nuiton.org/projects/sandbox/repository/revisions/598 Log: ajout de la classe Parser : plusieurs methodes pour parser des chaines de caracteres Added: testEugeneUML-YAML/testsnakeyaml/src/main/java/parser/ testEugeneUML-YAML/testsnakeyaml/src/main/java/parser/Parser.java Modified: testEugeneUML-YAML/testsnakeyaml/pom.xml Modified: testEugeneUML-YAML/testsnakeyaml/pom.xml =================================================================== --- testEugeneUML-YAML/testsnakeyaml/pom.xml 2013-04-23 15:02:36 UTC (rev 597) +++ testEugeneUML-YAML/testsnakeyaml/pom.xml 2013-04-24 13:33:57 UTC (rev 598) @@ -14,6 +14,11 @@ <artifactId>snakeyaml</artifactId> <version>1.12</version> </dependency> + <dependency> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene</artifactId> + <version>2.6.2</version> + </dependency> </dependencies> </project> \ No newline at end of file Added: testEugeneUML-YAML/testsnakeyaml/src/main/java/parser/Parser.java =================================================================== --- testEugeneUML-YAML/testsnakeyaml/src/main/java/parser/Parser.java (rev 0) +++ testEugeneUML-YAML/testsnakeyaml/src/main/java/parser/Parser.java 2013-04-24 13:33:57 UTC (rev 598) @@ -0,0 +1,179 @@ +package parser; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +public class Parser { + + public static String removeMultiChar(String str, List<Character> targets) + { + StringBuilder res = new StringBuilder(str.length()+1); + for(Character c : str.toCharArray()) + { + if(!targets.contains(c)) + { + res.append(c); + } + } + return res.toString(); + } + + public static String beforeChar(String str, Character target) + { + StringBuilder tmp = new StringBuilder(str.length()+1); + for(Character c : str.toCharArray()) + { + if(c.equals(target)) + { + return tmp.toString(); + } + else + { + tmp.append(c); + } + } + return tmp.toString(); + } + + //opt + public static String afterChar(String str, Character target) + { + StringBuilder in = new StringBuilder(str); + StringBuilder out = new StringBuilder(beforeChar(in.reverse().toString(),target)); + return out.reverse().toString(); + } + + public static String extract(Character start, Character end, String str) + { + StringBuilder tmp = new StringBuilder(str.length()+1); + boolean start_end = false; + for(Character c : str.toCharArray()) + { + if(!start_end && c.equals(start)) + { + start_end = true; + } + else if(start_end && c.equals(end)) + { + return tmp.toString(); + } + else if(start_end) + { + tmp.append(c); + } + } + return null; + } + + public static String extractPlus(Character start, Character end, String str) + { + StringBuilder tmp = new StringBuilder(str.length()+1); + boolean start_end = false; + int count = 0; + for(Character c : str.toCharArray()) + { + if(!start_end && c.equals(start)) + { + start_end = true; + } + else if(start_end && c.equals(start)) + { + count++; + tmp.append(c); + } + else if(start_end && c.equals(end)) + { + if(count>0) + { + count--; + tmp.append(c); + } + else + { + return tmp.toString(); + } + } + else if(start_end) + { + tmp.append(c); + } + } + return null; + } + + //opt + public static List<String> spaceParse(String str) + { + return charParse(str,' '); + } + + //opt + public static List<String> commaSpaceParse(String str) + { + ArrayList<Character> targets = new ArrayList<Character>(); + targets.add(' '); + targets.add(','); + return multiCharParse(str,targets); + } + + // fonctionnel/robuste/optimise + public static List<String> charParse(String str, Character target) + { + LinkedList<String> res = new LinkedList<String>(); + StringBuilder tmp = new StringBuilder(str.length()+1);//+1 utile en Java ? != C + boolean pre = false; + for(Character c : str.toCharArray()) + { + if(c.equals(target)) + { + if(pre) + { + res.add(tmp.toString()); + } + tmp.delete(0,tmp.length()); + pre = false; + } + else + { + tmp.append(c); + pre = true; + } + } + if(pre) + { + res.add(tmp.toString()); + } + return res; + } + + // fonctionnel/robuste/optimise + public static List<String> multiCharParse(String str, List<Character> targets) + { + LinkedList<String> res = new LinkedList<String>(); + StringBuilder tmp = new StringBuilder(str.length()+1);//+1 utile en Java ? != C + boolean pre = false; + for(Character c : str.toCharArray()) + { + if(targets.contains(c)) + { + if(pre) + { + res.add(tmp.toString()); + } + tmp.delete(0,tmp.length()); + pre = false; + } + else + { + tmp.append(c); + pre = true; + } + } + if(pre) + { + res.add(tmp.toString()); + } + return res; + } +}

1 0