svnno****@sourc*****
svnno****@sourc*****
2009年 2月 16日 (月) 08:12:32 JST
Revision: 2675
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2675
Author: daisuke_m
Date: 2009-02-16 08:12:32 +0900 (Mon, 16 Feb 2009)
Log Message:
-----------
DomainからdefaultValueプロパティを削除。/
クラスローダの調整を試みるがうまく行かず。。。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java
vesta/trunk/jiemamy-vesta/pom.xml
vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialog.java
vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialogDomainTab.java
vesta/trunk/org.jiemamy.eclipse.dialect.mysql/META-INF/MANIFEST.MF
vesta/trunk/org.jiemamy.eclipse.dialect.mysql/pom.xml
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java
zeus/trunk/jiemamy-spec-core/src/main/resources/jiemamy-core.xsd
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/attribute/ColumnModelImpl.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -66,12 +66,6 @@
* {@inheritDoc}
*/
public String getDefaultValue() {
- if (dataType instanceof DomainModel && defaultValue == null) {
- synchronized (dataType) {
- DomainModel domainModel = (DomainModel) dataType;
- return domainModel.getDefaultValue();
- }
- }
return defaultValue;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/model/datatype/DomainModelImpl.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -47,9 +47,6 @@
/** 制約のリスト */
private List<ValueConstraintModel> constraints;
- /** デフォルト値 */
- private String defaultValue;
-
/** 自由文字列 */
private String freeString;
@@ -107,13 +104,6 @@
/**
* {@inheritDoc}
*/
- public String getDefaultValue() {
- return defaultValue;
- }
-
- /**
- * {@inheritDoc}
- */
public String getDescription() {
return description;
}
@@ -180,13 +170,6 @@
/**
* {@inheritDoc}
*/
- public void setDefaultValue(String defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- /**
- * {@inheritDoc}
- */
public void setDescription(String description) {
this.description = description;
}
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomBuilder.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -278,7 +278,6 @@
DomUtil.newChild(domainElement, LOGICAL_NAME, domainModel.getLogicalName());
DomUtil.newChild(domainElement, DESCRIPTION, domainModel.getDescription());
newDataTypeElement(domainElement, domainModel.getDataType());
- DomUtil.newChild(domainElement, DEFAULT_VALUE, domainModel.getDefaultValue());
if (domainModel.getConstraints().size() > 0) {
Element constraintsElement = DomUtil.newChild(domainElement, CONSTRAINTS);
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/DomParser.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -333,7 +333,6 @@
domainModel.setLogicalName(XpathUtil.getTextContent(domainNode, "core:logicalName"));
domainModel.setDataType((BuiltinDataType) getDataType((Element) XpathUtil.getNode(domainNode,
"core:dataType")));
- domainModel.setDefaultValue(XpathUtil.getTextContent(domainNode, "core:defaultValue"));
NodeList constraintNodeList = XpathUtil.getNodes(domainNode, "core:constraints/*");
Iterable<Node> constraintIterableNodeList = new IterableNodeList(constraintNodeList);
Modified: vesta/trunk/jiemamy-vesta/pom.xml
===================================================================
--- vesta/trunk/jiemamy-vesta/pom.xml 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/jiemamy-vesta/pom.xml 2009-02-15 23:12:32 UTC (rev 2675)
@@ -77,7 +77,8 @@
<url>http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi/zeus/trunk/jiemamy-vesta/?root=jiemamy</url>
</scm>
<modules>
- <module>../org.jiemamy.eclipse</module>
+ <module>../org.jiemamy.eclipse</module>
+ <module>../org.jiemamy.eclipse.dialect.mysql</module>
</modules>
<build>
<plugins>
Modified: vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/org.jiemamy.eclipse/META-INF/MANIFEST.MF 2009-02-15 23:12:32 UTC (rev 2675)
@@ -58,3 +58,4 @@
org.jiemamy.eclipse.utils,
org.jiemamy.eclipse.wizard
Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialog.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialog.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialog.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -1,5 +1,7 @@
package org.jiemamy.eclipse.editor.dialog.root;
+import java.util.List;
+
import org.apache.commons.lang.StringUtils;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
@@ -85,7 +87,8 @@
cmbDialect = new Combo(composite, SWT.BORDER | SWT.READ_ONLY);
cmbDialect.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- for (Dialect dialect : JiemamyPlugin.getDialectResolver().getAllInstance()) {
+ List<Dialect> dialects = JiemamyPlugin.getDialectResolver().getAllInstance();
+ for (Dialect dialect : dialects) {
cmbDialect.add(dialect.toString());
}
cmbDialect.setText(rootModel.getDialectClassName());
Modified: vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialogDomainTab.java
===================================================================
--- vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialogDomainTab.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/org.jiemamy.eclipse/src/main/java/org/jiemamy/eclipse/editor/dialog/root/DatabaseEditDialogDomainTab.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -2,6 +2,8 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
+import java.util.Collection;
+import java.util.List;
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -44,13 +46,15 @@
import org.jiemamy.eclipse.ui.tab.AbstractTab;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.RootModel;
+import org.jiemamy.model.attribute.constraint.CheckConstraintModel;
import org.jiemamy.model.attribute.constraint.NotNullConstraintModel;
-import org.jiemamy.model.attribute.constraint.UniqueKeyModel;
+import org.jiemamy.model.attribute.constraint.ValueConstraintModel;
import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.model.datatype.DataType;
import org.jiemamy.model.datatype.DataTypeCategory;
import org.jiemamy.model.datatype.DomainModel;
import org.jiemamy.model.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.ListUtils;
import org.jiemamy.utils.model.DomainUtil;
@@ -73,14 +77,16 @@
private Text txtColumnSize;
- private Text txtDefaultValue;
+// private Text txtDefaultValue;
private Text txtDescription;
private Button chkIsNotNull;
- private Button chkIsUnique;
+// private Button chkIsUnique;
+ private Text txtCheck;
+
/**
* コンストラクタ。
@@ -185,7 +191,6 @@
* @param targetModel
*/
public DomainEditTableArea(RootModel targetModel) {
- super();
rootModel = targetModel;
}
@@ -235,15 +240,7 @@
updateModel();
}
});
- txtDefaultValue.addFocusListener(new TextSelectionAdapter(txtDefaultValue));
- txtDefaultValue.addKeyListener(new KeyAdapter() {
-
- @Override
- public void keyReleased(KeyEvent e) {
- updateModel();
- }
- });
- txtDescription.addFocusListener(new TextSelectionAdapter(txtDefaultValue));
+ txtDescription.addFocusListener(new TextSelectionAdapter(txtDescription));
txtDescription.addKeyListener(new KeyAdapter() {
@Override
@@ -251,7 +248,7 @@
updateModel();
}
});
- chkIsUnique.addSelectionListener(new SelectionAdapter() {
+ chkIsNotNull.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
@@ -260,13 +257,12 @@
enableEditDetailControls(domainEditIndex);
}
});
- chkIsNotNull.addSelectionListener(new SelectionAdapter() {
+ txtCheck.addFocusListener(new TextSelectionAdapter(txtCheck));
+ txtCheck.addKeyListener(new KeyAdapter() {
@Override
- public void widgetSelected(SelectionEvent e) {
- int domainEditIndex = getTableViewer().getTable().getSelectionIndex();
+ public void keyReleased(KeyEvent e) {
updateModel();
- enableEditDetailControls(domainEditIndex);
}
});
}
@@ -319,11 +315,11 @@
@Override
protected void configureTableViewer() {
TableViewer tableViewer = getTableViewer();
-// tableViewer.setCellModifier(new RecordCellModifier(tableViewer));
+// tableViewer.setCellModifier(new RecordCellModifier(tableViewer));
tableViewer.setLabelProvider(new DomainLabelProvider());
contentProvider = new DomainContentProvider();
tableViewer.setContentProvider(contentProvider);
-// tableViewer.setSorter(new ViewerSorter());
+// tableViewer.setSorter(new ViewerSorter());
tableViewer.setInput(rootModel.getDomains());
}
@@ -378,10 +374,10 @@
txtColumnSize.addFocusListener(new TextSelectionAdapter(txtColumnSize));
label = new Label(cmpTypes, SWT.NULL);
- label.setText("dialog.db.domain.label.defaultValue"); // RESOURCE
+ label.setText("dialog.db.domain.label.check"); // RESOURCE
- txtDefaultValue = new Text(cmpTypes, SWT.BORDER);
- txtDefaultValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ txtCheck = new Text(cmpTypes, SWT.BORDER);
+ txtCheck.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
Composite cmpDesc = new Composite(group, SWT.NULL);
cmpDesc.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -401,9 +397,6 @@
cmpChecks.setLayout(rowLayout);
cmpChecks.setLayoutData(new GridData());
- chkIsUnique = new Button(cmpChecks, SWT.CHECK);
- chkIsUnique.setText("dialog.db.domain.label.unique"); // RESOURCE
-
chkIsNotNull = new Button(cmpChecks, SWT.CHECK);
chkIsNotNull.setText("dialog.db.domain.label.notNull"); // RESOURCE
@@ -425,9 +418,9 @@
colType.setText("dialog.db.domain.tbl.header.type"); // RESOURCE
colType.setWidth(150);
- TableColumn colDefaultValue = new TableColumn(table, SWT.LEFT);
- colDefaultValue.setText("dialog.db.domain.tbl.header.defaultValue"); // RESOURCE
- colDefaultValue.setWidth(100);
+// TableColumn colDefaultValue = new TableColumn(table, SWT.LEFT);
+// colDefaultValue.setText("dialog.db.domain.tbl.header.defaultValue"); // RESOURCE
+// colDefaultValue.setWidth(100);
TableColumn colNotNull = new TableColumn(table, SWT.LEFT);
colNotNull.setText("dialog.db.domain.tbl.header.notNull"); // RESOURCE
@@ -444,18 +437,16 @@
cmbColumnType.setText("");
txtColumnSize.setText("");
- txtDefaultValue.setText("");
+ txtCheck.setText("");
txtDescription.setText("");
chkIsNotNull.setSelection(false);
- chkIsUnique.setSelection(false);
txtDomainName.setEnabled(false);
cmbColumnType.setEnabled(false);
txtColumnSize.setEnabled(false);
- txtDefaultValue.setEnabled(false);
+ txtCheck.setEnabled(false);
txtDescription.setEnabled(false);
chkIsNotNull.setEnabled(false);
- chkIsUnique.setEnabled(false);
// for (Map.Entry<DialectOption, DialectOptionUI> entry : domainOptionUIs.entrySet()) {
// entry.getValue().setEnabled(false);
@@ -472,18 +463,23 @@
// cmbColumnType.setText(rootModel.getDialect().convertToPrimitiveType(columnType).getIdentifier());
txtColumnSize
.setText(String.valueOf(domain.getDataType().getAdapter(SizedDataTypeAdapter.class).getSize()));
- txtDefaultValue.setText(domain.getDefaultValue());
txtDescription.setText(domain.getDescription());
chkIsNotNull.setSelection(DomainUtil.hasConstraint(domain, NotNullConstraintModel.class));
- chkIsUnique.setSelection(DomainUtil.hasConstraint(domain, UniqueKeyModel.class));
+ List<ValueConstraintModel> constraints = domain.getConstraints();
+ for (ValueConstraintModel valueConstraintModel : constraints) {
+ if (valueConstraintModel instanceof CheckConstraintModel) {
+ CheckConstraintModel checkConstraintModel = (CheckConstraintModel) valueConstraintModel;
+ txtCheck.setText(checkConstraintModel.getExpression());
+ break;
+ }
+ }
txtDomainName.setEnabled(true);
cmbColumnType.setEnabled(true);
txtColumnSize.setEnabled(true);
- txtDefaultValue.setEnabled(true);
txtDescription.setEnabled(true);
chkIsNotNull.setEnabled(true);
- chkIsUnique.setEnabled(true);
+ txtCheck.setEnabled(true);
// if (domainOptions != null) {
// for (DialectOption columnOption : domainOptions) {
@@ -591,11 +587,22 @@
// } else {
// domain.setSize(txtColumnSize.getText());
// }
- domain.setDefaultValue(txtDefaultValue.getText());
domain.setDescription(txtDescription.getText());
-// domain.setConstraint(DefinitionModel.CONSTRAINT_UNIQUE, chkIsUnique.getSelection());
-// domain.setConstraint(DefinitionModel.CONSTRAINT_NOT_NULL, chkIsNotNull.getSelection());
+ if (chkIsNotNull.getSelection()) {
+ Collection<ValueConstraintModel> toRemove = CollectionsUtil.newArrayList();
+ List<ValueConstraintModel> constraints = domain.getConstraints();
+ for (ValueConstraintModel valueConstraintModel : constraints) {
+ if (valueConstraintModel instanceof NotNullConstraintModel) {
+ toRemove.add(valueConstraintModel);
+ }
+ }
+ constraints.removeAll(toRemove);
+ } else if (DomainUtil.hasConstraint(domain, NotNullConstraintModel.class) == false) {
+ JiemamyFactory factory = rootModel.getJiemamy().getFactory();
+ NotNullConstraintModel nnConstraint = factory.newModel(NotNullConstraintModel.class);
+ domain.getConstraints().add(nnConstraint);
+ }
// for (Map.Entry<DialectOption, DialectOptionUI> entry : domainOptionUIs.entrySet()) {
// entry.getValue().setDataControlToModel();
@@ -611,12 +618,6 @@
*/
private class DomainLabelProvider implements ITableLabelProvider {
- /**
- * Override method.
- *
- * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(
- * org.eclipse.jface.viewers.ILabelProviderListener)
- */
public void addListener(ILabelProviderListener listener) {
// nothing to do
}
@@ -649,8 +650,6 @@
return LabelStringUtil.getString(rootModel, domain, DisplayTarget.NAME, DisplayPlace.FIGURE);
case 1:
return LabelStringUtil.getString(rootModel, domain, DisplayTarget.TYPE, DisplayPlace.FIGURE);
- case 2:
- return domain.getDefaultValue();
default:
return "";
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.mysql/META-INF/MANIFEST.MF
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.mysql/META-INF/MANIFEST.MF 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.mysql/META-INF/MANIFEST.MF 2009-02-15 23:12:32 UTC (rev 2675)
@@ -26,3 +26,5 @@
Require-Bundle: org.jiemamy.eclipse
Eclipse-BuddyPolicy: registered
Eclipse-LazyStart: true
+Eclipse-RegisterBuddy: org.jiemamy.eclipse
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: vesta/trunk/org.jiemamy.eclipse.dialect.mysql/pom.xml
===================================================================
--- vesta/trunk/org.jiemamy.eclipse.dialect.mysql/pom.xml 2009-02-15 18:57:32 UTC (rev 2674)
+++ vesta/trunk/org.jiemamy.eclipse.dialect.mysql/pom.xml 2009-02-15 23:12:32 UTC (rev 2675)
@@ -58,7 +58,6 @@
</goals>
<configuration>
<outputDirectory>${basedir}/lib</outputDirectory>
- <excludeGroupIds>org.eclipse,org.eclipse.ui,org.eclipse.update</excludeGroupIds>
<includeScope>compile</includeScope>
<excludeScope>test</excludeScope>
<overWriteReleases>false</overWriteReleases>
@@ -74,10 +73,8 @@
</goals>
<configuration>
<outputDirectory>${basedir}/lib/sources</outputDirectory>
- <excludeGroupIds>org.eclipse,org.eclipse.ui,org.eclipse.update</excludeGroupIds>
<includeScope>compile</includeScope>
<excludeScope>test</excludeScope>
- <excludeTransitive>true</excludeTransitive>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
@@ -134,130 +131,6 @@
<artifactId>jiemamy-dialect-mysql</artifactId>
<version>${project.version}</version>
</dependency>
-
-<!--
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>3.3.0-I20070614-0800</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>3.2.100-I20070319-0010</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>3.3.0-I20070620</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>gef</artifactId>
- <version>3.2.100-v20070620</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>core</artifactId>
- <version>3.2.100-v20070615</version>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>runtime</artifactId>
- <version>3.3.100-v20070530</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>resources</artifactId>
- <version>3.3.0-v20070604</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.core</groupId>
- <artifactId>expressions</artifactId>
- <version>3.3.0-v20070531-1300</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>ui</artifactId>
- <version>3.3.0-I20070614-0800</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>editors</artifactId>
- <version>3.3.0-v20070606-0010</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>views</artifactId>
- <version>3.2.100-I20070319-0010</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.ui</groupId>
- <artifactId>ide</artifactId>
- <version>3.3.0-I20070620</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0-v_771</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>launching</artifactId>
- <version>3.3.0-v20070510</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ui</artifactId>
- <version>3.3.0-v20070607-0010</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>gef</artifactId>
- <version>3.2.100-v20070620</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.update</groupId>
- <artifactId>core</artifactId>
- <version>3.2.100-v20070615</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.debug</groupId>
- <artifactId>core</artifactId>
- <version>3.3.0-v20070607-1800</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.swt.win32.win32</groupId>
- <artifactId>x86</artifactId>
- <version>3.3.0-v3346</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<distributionManagement>
<site>
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java 2009-02-15 18:57:32 UTC (rev 2674)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/model/datatype/DomainModel.java 2009-02-15 23:12:32 UTC (rev 2675)
@@ -55,12 +55,6 @@
BuiltinDataType getDataType();
/**
- * デフォルト値を取得する。
- * @return デフォルト値
- */
- String getDefaultValue();
-
- /**
* 説明文を取得する。
* @return 説明文
*/
@@ -103,12 +97,6 @@
void setDataType(BuiltinDataType dataType);
/**
- * デフォルト値を設定する。
- * @param defaultValue デフォルト値
- */
- void setDefaultValue(String defaultValue);
-
- /**
* 説明文を設定する。
* @param description 説明文
*/
Modified: zeus/trunk/jiemamy-spec-core/src/main/resources/jiemamy-core.xsd
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/resources/jiemamy-core.xsd 2009-02-15 18:57:32 UTC (rev 2674)
+++ zeus/trunk/jiemamy-spec-core/src/main/resources/jiemamy-core.xsd 2009-02-15 23:12:32 UTC (rev 2675)
@@ -58,7 +58,6 @@
<xsd:element ref="logicalName" minOccurs="0" />
<xsd:element ref="description" minOccurs="0" />
<xsd:element ref="dataType" />
- <xsd:element ref="defaultValue" minOccurs="0" />
<xsd:element ref="constraints" minOccurs="0" />
<xsd:element ref="freeString" minOccurs="0" />
<xsd:element ref="adapter" minOccurs="0" maxOccurs="unbounded"/>