[ooo-build-commit] ooeclipse: Branch 'master' - 4 commits
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Wed Aug 5 02:17:33 PDT 2009
build/checkstyle.xml | 145 ++++----
core/.checkstyle | 13
core/.project | 4
core/schema/definition.xsd | 177 ++++++++++
core/schema/xlink.xsd | 75 ++++
cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java | 32 +
cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java | 48 +-
cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java | 32 +
cpp/source/org/openoffice/ide/eclipse/cpp/CppUI.java | 30 +
cpp/source/org/openoffice/ide/eclipse/cpp/Language.java | 32 +
java/.project | 4
11 files changed, 492 insertions(+), 100 deletions(-)
New commits:
commit 2dae2987a063454e3801bf7b8897829f0abaa542
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Aug 5 11:19:02 2009 +0200
Added a header to the descrition.xsd file.
diff --git a/core/schema/definition.xsd b/core/schema/definition.xsd
index d83c640..7cb2f5c 100644
--- a/core/schema/definition.xsd
+++ b/core/schema/definition.xsd
@@ -1,4 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ -->
<xs:schema targetNamespace="http://openoffice.org/extensions/description/2006"
elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://openoffice.org/extensions/description/2006">
commit 666f3dcc767f64b402f3c3261c0f158833eb8f4f
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Aug 5 11:18:13 2009 +0200
Updated checkstyle config for eclipse-cs 5.x
diff --git a/build/checkstyle.xml b/build/checkstyle.xml
index a3a36f9..eb3784e 100644
--- a/build/checkstyle.xml
+++ b/build/checkstyle.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
<!--
This configuration file was written by the eclipse-cs plugin configuration editor
-->
@@ -6,78 +8,77 @@
Checkstyle-Configuration: ooeclipseintegration style
Description: none
-->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="TreeWalker">
- <module name="LeftCurly"/>
- <module name="RightCurly"/>
- <module name="TrailingComment">
- <property name="legalComment" value="\$NON-NLS-[0-9]+\$"/>
- </module>
- <module name="AvoidInlineConditionals"/>
- <module name="HiddenField"/>
- <module name="UnnecessaryParentheses"/>
- <module name="AvoidStarImport"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT"/>
- </module>
- <module name="ModifierOrder"/>
- <module name="NeedBraces"/>
- <module name="MagicNumber"/>
- <module name="SimplifyBooleanReturn"/>
- <module name="StaticVariableName">
- <property name="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="ParameterName">
- <property name="format" value="^p[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MemberName">
- <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
- </module>
- <module name="ConstantName"/>
- <module name="PackageName"/>
- <module name="EmptyStatement"/>
- <module name="DeclarationOrder"/>
- <module name="InnerAssignment"/>
- <module name="NestedIfDepth">
- <property name="max" value="2"/>
- </module>
- <module name="NestedTryDepth"/>
- <module name="PackageDeclaration"/>
- <module name="ReturnCount">
- <property name="max" value="1"/>
- </module>
- <module name="SimplifyBooleanExpression"/>
- <module name="BooleanExpressionComplexity"/>
- <module name="CyclomaticComplexity"/>
- <module name="JavaNCSS"/>
- <module name="NPathComplexity"/>
- <module name="TodoComment">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="TODO comment left"/>
- <property name="format" value="TODO"/>
- </module>
- <module name="AvoidNestedBlocks"/>
- <module name="UnusedImports">
- <property name="severity" value="info"/>
- </module>
- <module name="JavadocMethod">
- <property name="logLoadErrors" value="true"/>
- <property name="suppressLoadErrors" value="true"/>
- </module>
- <module name="JavadocStyle"/>
- <module name="JavadocType"/>
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- <module name="TabCharacter"/>
- <module name="Indentation"/>
- <module name="RegexpHeader">
- <property name="severity" value="info"/>
- <property name="headerFile" value="${samedir}/header.txt"/>
- </module>
- <module name="EmptyBlock">
- <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
- </module>
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="LeftCurly"/>
+ <module name="RightCurly"/>
+ <module name="TrailingComment">
+ <property name="legalComment" value="\$NON-NLS-[0-9]+\$"/>
</module>
+ <module name="AvoidInlineConditionals"/>
+ <module name="HiddenField"/>
+ <module name="UnnecessaryParentheses"/>
+ <module name="AvoidStarImport"/>
+ <module name="WhitespaceAround">
+ <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT"/>
+ </module>
+ <module name="ModifierOrder"/>
+ <module name="NeedBraces"/>
+ <module name="MagicNumber"/>
+ <module name="SimplifyBooleanReturn"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^s[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="ParameterName">
+ <property name="format" value="^p[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MemberName">
+ <property name="format" value="^m[A-Z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="ConstantName"/>
+ <module name="PackageName"/>
+ <module name="EmptyStatement"/>
+ <module name="DeclarationOrder"/>
+ <module name="InnerAssignment"/>
+ <module name="NestedIfDepth">
+ <property name="max" value="2"/>
+ </module>
+ <module name="NestedTryDepth"/>
+ <module name="PackageDeclaration"/>
+ <module name="ReturnCount">
+ <property name="max" value="1"/>
+ </module>
+ <module name="SimplifyBooleanExpression"/>
+ <module name="BooleanExpressionComplexity"/>
+ <module name="CyclomaticComplexity"/>
+ <module name="JavaNCSS"/>
+ <module name="NPathComplexity"/>
+ <module name="TodoComment">
+ <property name="format" value="TODO"/>
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.customMessage" value="TODO comment left"/>
+ </module>
+ <module name="AvoidNestedBlocks"/>
+ <module name="UnusedImports">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="JavadocMethod">
+ <property name="logLoadErrors" value="true"/>
+ <property name="suppressLoadErrors" value="true"/>
+ </module>
+ <module name="JavadocStyle"/>
+ <module name="JavadocType"/>
+ <module name="LineLength">
+ <property name="max" value="120"/>
+ </module>
+ <module name="Indentation"/>
+ <module name="EmptyBlock">
+ <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
+ </module>
+ </module>
+ <module name="RegexpHeader">
+ <property name="severity" value="info"/>
+ <property name="headerFile" value="${samedir}/header.txt"/>
+ </module>
+ <module name="FileTabCharacter"/>
</module>
diff --git a/core/.checkstyle b/core/.checkstyle
index 0f58416..0596e7f 100644
--- a/core/.checkstyle
+++ b/core/.checkstyle
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<fileset-config file-format-version="1.2.0" simple-config="true">
- <local-check-config name="ooeclipseintegration style" location="/org.openoffice.ide.eclipse.build/checkstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="tous" enabled="true" check-config-name="ooeclipseintegration style" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
+ <local-check-config name="ooeclipseintegration style" location="/org.openoffice.ide.eclipse.build/checkstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="ooeclipseintegration style" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
</fileset-config>
diff --git a/core/.project b/core/.project
index c418fd9..099bc94 100755
--- a/core/.project
+++ b/core/.project
@@ -21,7 +21,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -29,6 +29,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
diff --git a/java/.project b/java/.project
index fbc8b53..5aaee2f 100644
--- a/java/.project
+++ b/java/.project
@@ -21,7 +21,7 @@
</arguments>
</buildCommand>
<buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
@@ -29,6 +29,6 @@
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
commit f0a309fab005b2ab1952ad28c1c843091d402c50
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Aug 5 11:17:26 2009 +0200
Code cleaning in the C++ plugin
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java b/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java
index 8f41770..38d1bab 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/Activator.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
package org.openoffice.ide.eclipse.cpp;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -9,7 +39,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.openoffice.ide.eclipse.cpp";
+ public static final String PLUGIN_ID = "org.openoffice.ide.eclipse.cpp"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java
index 0c52e8e..7d37407 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/CppBuilder.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
package org.openoffice.ide.eclipse.cpp;
import java.io.File;
@@ -10,7 +40,6 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.IIncludeEntry;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
@@ -24,18 +53,9 @@ import org.openoffice.ide.eclipse.core.preferences.IOOo;
import org.openoffice.ide.eclipse.core.preferences.ISdk;
public class CppBuilder implements ILanguageBuilder {
-
- private Language mLanguage;
-
- /**
- * Constructor.
- *
- * @param pLanguage the C++ Language object
- */
- public CppBuilder( Language pLanguage ) {
- mLanguage = pLanguage;
- }
+ private static final String INCLUDE = "include"; //$NON-NLS-1$
+
@Override
public IPath createLibrary(IUnoidlProject unoProject) throws Exception {
// TODO Auto-generated method stub
@@ -74,7 +94,7 @@ public class CppBuilder implements ILanguageBuilder {
String command = "cppumaker -T\"*\"" + //$NON-NLS-1$
" -Gc -BUCR " + //$NON-NLS-1$
- "-O \"" + new File( pBuildFolder, "include" ).getAbsolutePath() + "\" \"" + //$NON-NLS-1$ //$NON-NLS-2$
+ "-O \"" + new File( pBuildFolder, INCLUDE ).getAbsolutePath() + "\" \"" + //$NON-NLS-1$ //$NON-NLS-2$
pTypesFile.getAbsolutePath() + "\" " + //$NON-NLS-1$
oooTypesArgs;
@@ -98,7 +118,7 @@ public class CppBuilder implements ILanguageBuilder {
// Check if the build/include dir is in the includes
ICProject cprj = CoreModel.getDefault().create( pPrj );
- IPath incPath = unoprj.getBuildPath().append( "include" );
+ IPath incPath = unoprj.getBuildPath().append( INCLUDE );
if ( !cprj.isOnSourceRoot( pPrj.getFolder( incPath ) ) ) {
try {
IIncludeEntry entry = CoreModel.newIncludeEntry( null, null, incPath );
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
index b7866bc..88e9888 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/CppProjectHandler.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
package org.openoffice.ide.eclipse.cpp;
import org.eclipse.cdt.core.CCProjectNature;
@@ -8,8 +38,6 @@ import org.eclipse.cdt.core.model.IIncludeEntry;
import org.eclipse.cdt.core.model.IPathEntry;
import org.eclipse.cdt.core.model.ISourceEntry;
import org.eclipse.cdt.make.core.MakeProjectNature;
-import org.eclipse.cdt.make.core.scannerconfig.ScannerConfigNature;
-import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/CppUI.java b/cpp/source/org/openoffice/ide/eclipse/cpp/CppUI.java
index 5382985..0cdb423 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/CppUI.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/CppUI.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
package org.openoffice.ide.eclipse.cpp;
import org.openoffice.ide.eclipse.core.model.UnoFactoryData;
diff --git a/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java b/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java
index ab9be5b..acea7b5 100644
--- a/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java
+++ b/cpp/source/org/openoffice/ide/eclipse/cpp/Language.java
@@ -1,3 +1,33 @@
+/*************************************************************************
+ *
+ * The Contents of this file are made available subject to the terms of
+ * the GNU Lesser General Public License Version 2.1
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2009 by Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * The Initial Developer of the Original Code is: Cédric Bosdonnat.
+ *
+ * Copyright: 2009 by Novell, Inc.
+ *
+ * All Rights Reserved.
+ *
+ ************************************************************************/
package org.openoffice.ide.eclipse.cpp;
import org.openoffice.ide.eclipse.core.model.language.ILanguage;
@@ -9,7 +39,7 @@ public class Language implements ILanguage {
@Override
public ILanguageBuilder getLanguageBuidler() {
- return new CppBuilder( this );
+ return new CppBuilder( );
}
@Override
commit d57dc916ff811b57832e302b39bc95a1c1f108c6
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Wed Aug 5 11:02:05 2009 +0200
Added a first schema for the description.xml files
The schema is still not used by the plugin. This is a first try to get
things progress.
diff --git a/core/schema/definition.xsd b/core/schema/definition.xsd
new file mode 100644
index 0000000..d83c640
--- /dev/null
+++ b/core/schema/definition.xsd
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema targetNamespace="http://openoffice.org/extensions/description/2006"
+ elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://openoffice.org/extensions/description/2006">
+
+ <xs:import schemaLocation="xlink.xsd" namespace="http://www.w3.org/1999/xlink" />
+ <xs:element name="description" type="TDescription" />
+
+ <xs:complexType name="TDescription">
+ <xs:sequence>
+ <xs:element name="version" type="TValue" minOccurs="0"
+ maxOccurs="1" />
+ <xs:element name="identifier" type="TValue" minOccurs="0"
+ maxOccurs="1" />
+ <xs:element name="platform" type="TValue" minOccurs="0"
+ maxOccurs="1" />
+ <xs:element name="dependencies" type="TDependencies"
+ minOccurs="0" maxOccurs="1" />
+ <xs:element name="update-information" minOccurs="0"
+ maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="src" type="TLink" minOccurs="1"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="registration" type="TRegistration"
+ minOccurs="0" maxOccurs="1" />
+ <xs:element name="publisher" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="TPubName" minOccurs="1"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="release-notes" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="src" type="TLocalizedLink" minOccurs="1"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="display-name" minOccurs="0" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="TName" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="icon" type="TIcon" minOccurs="0"
+ maxOccurs="1" />
+ <xs:element name="extension-description" minOccurs="0"
+ maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="src" type="TLocalizedLink" minOccurs="1"
+ maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="TValue">
+ <xs:attribute name="value" type="xs:string" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="TDependencies">
+ <xs:sequence>
+ <xs:element name="OpenOffice.org-minimal-version" type="TVersion"
+ minOccurs="0" maxOccurs="1" />
+ <xs:element name="OpenOffice.org-maximal-version" type="TVersion"
+ minOccurs="0" maxOccurs="1" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="TVersion">
+ <xs:attribute name="value" type="xs:string" use="required" />
+ <xs:attribute name="name" type="xs:string" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="TLink">
+ <xs:attribute ref="xlink:href" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="TRegistration">
+ <xs:sequence>
+ <xs:element name="simple-license" minOccurs="1" maxOccurs="1">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="license-text" type="TLocalizedLink" />
+ </xs:sequence>
+ <xs:attribute name="accept-by" use="required">
+ <xs:simpleType>
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="user" />
+ <xs:enumeration value="admin" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:attribute>
+ <xs:attribute name="suppress-on-update" type="xs:boolean"
+ use="optional" default="false" />
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="TLocalizedLink">
+ <xs:complexContent>
+ <xs:extension base="TLink">
+ <xs:attribute name="lang" type="TLocale" use="required" />
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="TPubName">
+ <xs:simpleContent>
+ <xs:extension base="TName">
+ <xs:attribute ref="xlink:href" use="required" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="TName">
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="lang" type="TLocale" use="required" />
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:complexType name="TIcon">
+ <xs:sequence>
+ <xs:element name="default" type="TLink" minOccurs="0"
+ maxOccurs="1"/>
+ <xs:element name="hight-contrast" type="TLink" minOccurs="0" maxOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="TLocale">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[a-z]{2,2}(-[A-Z]{2,2}(-[a-zA-Z]+)?)?"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+</xs:schema>
\ No newline at end of file
diff --git a/core/schema/xlink.xsd b/core/schema/xlink.xsd
new file mode 100644
index 0000000..f55eb6d
--- /dev/null
+++ b/core/schema/xlink.xsd
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- METS XLink Schema, v. 2, Nov. 15, 2004 -->
+<schema targetNamespace="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xlink="http://www.w3.org/1999/xlink" elementFormDefault="qualified">
+ <!-- global attributes -->
+ <attribute name="href" type="anyURI"/>
+ <attribute name="role" type="string"/>
+ <attribute name="arcrole" type="string"/>
+ <attribute name="title" type="string" />
+ <attribute name="show">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="new" />
+ <enumeration value="replace" />
+ <enumeration value="embed" />
+ <enumeration value="other" />
+ <enumeration value="none" />
+ </restriction>
+ </simpleType>
+ </attribute>
+ <attribute name="actuate">
+ <simpleType>
+ <restriction base="string">
+ <enumeration value="onLoad" />
+ <enumeration value="onRequest" />
+ <enumeration value="other" />
+ <enumeration value="none" />
+ </restriction>
+ </simpleType>
+ </attribute>
+ <attribute name="label" type="string" />
+ <attribute name="from" type="string" />
+ <attribute name="to" type="string" />
+ <attributeGroup name="simpleLink">
+ <attribute name="type" type="string" fixed="simple" form="qualified" />
+ <attribute ref="xlink:href" use="optional" />
+ <attribute ref="xlink:role" use="optional" />
+ <attribute ref="xlink:arcrole" use="optional" />
+ <attribute ref="xlink:title" use="optional" />
+ <attribute ref="xlink:show" use="optional" />
+ <attribute ref="xlink:actuate" use="optional" />
+ </attributeGroup>
+ <attributeGroup name="extendedLink">
+ <attribute name="type" type="string" fixed="extended" form="qualified" />
+ <attribute ref="xlink:role" use="optional" />
+ <attribute ref="xlink:title" use="optional" />
+ </attributeGroup>
+ <attributeGroup name="locatorLink">
+ <attribute name="type" type="string" fixed="locator" form="qualified" />
+ <attribute ref="xlink:href" use="required" />
+ <attribute ref="xlink:role" use="optional" />
+ <attribute ref="xlink:title" use="optional" />
+ <attribute ref="xlink:label" use="optional" />
+ </attributeGroup>
+ <attributeGroup name="arcLink">
+ <attribute name="type" type="string" fixed="arc" form="qualified" />
+ <attribute ref="xlink:arcrole" use="optional" />
+ <attribute ref="xlink:title" use="optional" />
+ <attribute ref="xlink:show" use="optional" />
+ <attribute ref="xlink:actuate" use="optional" />
+ <attribute ref="xlink:from" use="optional" />
+ <attribute ref="xlink:to" use="optional" />
+ </attributeGroup>
+ <attributeGroup name="resourceLink">
+ <attribute name="type" type="string" fixed="resource" form="qualified" />
+ <attribute ref="xlink:role" use="optional" />
+ <attribute ref="xlink:title" use="optional" />
+ <attribute ref="xlink:label" use="optional" />
+ </attributeGroup>
+ <attributeGroup name="titleLink">
+ <attribute name="type" type="string" fixed="title" form="qualified" />
+ </attributeGroup>
+ <attributeGroup name="emptyLink">
+ <attribute name="type" type="string" fixed="none" form="qualified" />
+ </attributeGroup>
+</schema>
More information about the ooo-build-commit
mailing list