Skip to content

Commit

Permalink
Merge pull request #10 from tmdmaker/eclipse2020-12
Browse files Browse the repository at this point in the history
#9 update 2020-12
  • Loading branch information
nakag committed Jan 10, 2021
2 parents b7621dc + 83dab56 commit 89bd61c
Show file tree
Hide file tree
Showing 31 changed files with 327 additions and 201 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2019 TMD-Maker Project <https://www.tmdmaker.org>
* Copyright 2009-2021 TMD-Maker Project <https://www.tmdmaker.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
10 changes: 7 additions & 3 deletions bundles/org.tmdmaker.csv/.classpath
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-3.10.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/opencsv-2.4.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
10 changes: 4 additions & 6 deletions bundles/org.tmdmaker.csv/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.tmdmaker.core;bundle-version="0.9.0",
org.tmdmaker.extensions;bundle-version="0.9.0"
Bundle-ClassPath: .,
lib/opencsv-2.4.jar
Export-Package: au.com.bytecode.opencsv;x-internal:=true,
au.com.bytecode.opencsv.bean;x-internal:=true,
org.tmdmaker.csv;x-internal:=true,
org.tmdmaker.generate.csv.attributelist,
org.tmdmaker.importer.csv
lib/opencsv-3.10.jar
Export-Package: org.tmdmaker.csv;x-internal:=true,
org.tmdmaker.generate.csv.attributelist;uses:="org.tmdmaker.model.generate",
org.tmdmaker.importer.csv;uses:="org.tmdmaker.model.importer"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: TMD-Maker Project
Automatic-Module-Name: tmdmaker.csv
3 changes: 1 addition & 2 deletions bundles/org.tmdmaker.csv/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ source.. = src/
output.. = target/classes/
bin.includes = META-INF/,\
.,\
lib/,\
plugin.xml,\
lib/opencsv-2.4.jar
lib/
Binary file removed bundles/org.tmdmaker.csv/lib/opencsv-2.4.jar
Binary file not shown.
Binary file added bundles/org.tmdmaker.csv/lib/opencsv-3.10.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2019 TMD-Maker Project <https://www.tmdmaker.org>
* Copyright 2009-2021 TMD-Maker Project <https://www.tmdmaker.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,7 +30,9 @@
import org.tmdmaker.csv.Messages;
import org.tmdmaker.model.generate.Generator;

import au.com.bytecode.opencsv.CSVWriter;
import com.opencsv.CSVWriter;



/**
* アトリビュートリストをCSVで出力するクラス
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2019 TMD-Maker Project <https://www.tmdmaker.org>
* Copyright 2009-2021 TMD-Maker Project <https://www.tmdmaker.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,6 @@
package org.tmdmaker.importer.csv;

import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -28,7 +27,8 @@
import org.tmdmaker.csv.Messages;
import org.tmdmaker.model.importer.FileImporter;

import au.com.bytecode.opencsv.CSVReader;
import com.opencsv.CSVReader;


/**
* アトリビュートをCSVファイルからインポートするクラス
Expand All @@ -46,7 +46,7 @@ public class AttributeFileImporter implements FileImporter {
*/
@Override
public List<AbstractEntityModel> importEntities(String filePath)
throws FileNotFoundException, IOException {
throws IOException {

CSVReader reader = new CSVReader(new BufferedReader(new FileReader(
filePath)));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2009-2019 TMD-Maker Project <https://www.tmdmaker.org>
* Copyright 2009-2021 TMD-Maker Project <https://www.tmdmaker.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,7 +16,6 @@
package org.tmdmaker.importer.csv;

import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -35,7 +34,8 @@
import org.tmdmaker.csv.Messages;
import org.tmdmaker.model.importer.FileImporter;

import au.com.bytecode.opencsv.CSVReader;
import com.opencsv.CSVReader;


/**
* エンティティをCSVファイルからインポートするクラス
Expand Down Expand Up @@ -64,7 +64,7 @@ public String getImporterName() {
*/
@Override
public List<AbstractEntityModel> importEntities(String filePath)
throws FileNotFoundException, IOException {
throws IOException {
CSVReader reader = new CSVReader(new BufferedReader(new FileReader(filePath)));
String[] nextLine;
AbstractEntityModel l = null;
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.tmdmaker.imagegenerator/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Export-Package: org.eclipse.gmf.runtime.common.ui.util;x-internal:=true,
org.eclipse.gmf.runtime.draw2d.ui.render.internal;x-internal:=true,
org.eclipse.gmf.runtime.draw2d.ui.render.internal.factory;x-internal:=true,
org.eclipse.gmf.runtime.draw2d.ui.render.internal.image;x-internal:=true,
org.tmdmaker.imagegenerator,
org.tmdmaker.imagegenerator;uses:="org.osgi.framework,org.eclipse.draw2d,org.eclipse.ui.plugin",
org.tmdmaker.imagegenerator.generator;x-internal:=true,
org.tmdmaker.imagegenerator.generator.converter;x-internal:=true
Automatic-Module-Name: tmdmaker.imagegenerator
29 changes: 18 additions & 11 deletions releng/org.tmdmaker.configuration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,18 @@
<velocity-version>1.7</velocity-version>
<jaxb-api-version>2.4.0-b180830.0359</jaxb-api-version>
<xstream-version>1.4.10</xstream-version>
<opencsv-version>2.3</opencsv-version>
<opencsv-version>3.1</opencsv-version>
<ddlutils-version>1.0</ddlutils-version>
<slf4j-version>1.7.26</slf4j-version>
<!-- build settings -->
<release-version>0.9.0</release-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<os-jvm-flags />
<project-url>https://www.tmdmaker.org</project-url>
<target-file>2020-09</target-file>
<target-file>2020-12</target-file>
<compiler-verion>1.8</compiler-verion>
<!-- Website dependencies version -->
<reflow-velocity-tools-version>2.3.0</reflow-velocity-tools-version>
<fontawesomeVersion>5.4.1</fontawesomeVersion>
<popperVersion>1.14.3</popperVersion>
<site-skin-version>2.0.10</site-skin-version>
<!-- Other -->
</properties>

Expand Down Expand Up @@ -93,6 +91,15 @@
<jvm-flags>--add-modules=ALL-SYSTEM</jvm-flags>
</properties>
</profile>
<profile>
<id>2020-12</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<target-file>2020-12</target-file>
</properties>
</profile>
<profile>
<id>2020-09</id>
<activation>
Expand Down Expand Up @@ -220,8 +227,7 @@
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin-version}</version>
<configuration>
<locales>ja</locales>
<inputEncoding>UTF-8</inputEncoding>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
</configuration>
<executions>
Expand All @@ -243,10 +249,11 @@
<artifactId>velocity</artifactId>
<version>${velocity-version}</version>
</dependency>
<!-- Docs Maven Skin -->
<dependency>
<groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId>
<version>${reflow-velocity-tools-version}</version>
<groupId>com.bernardomg.maven.skins</groupId>
<artifactId>docs-maven-skin</artifactId>
<version>${site-skin-version}</version>
</dependency>
</dependencies>
</plugin>
Expand All @@ -271,7 +278,7 @@
<version>${ddlutils-version}</version>
</additionalDependency>
<additionalDependency>
<groupId>au.com.bytecode</groupId>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
<version>${opencsv-version}</version>
</additionalDependency>
Expand Down
57 changes: 57 additions & 0 deletions releng/org.tmdmaker.releng.targetplatform/2020-12.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="Running Platform">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://archive.eclipse.org/technology/babel/update-site/R0.15.1/mars"/>
<unit id="org.eclipse.babel.nls_tools.gef_ja.feature.group" version="4.5.0.v20171231064042"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.apache.batik.pdf" version="1.6.0.v201105071520"/>
<unit id="org.apache.batik.extension" version="1.6.0.v201011041432"/>
<unit id="org.apache.batik.svggen" version="1.6.0.v201011041432"/>
<unit id="org.apache.batik.swing" version="1.6.0.v201011041432"/>
<unit id="org.apache.batik.transcoder" version="1.6.0.v201011041432"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.jcl" version="1.7.2.v20130115-1340"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/justj/jres/11/updates/release/11.0.2"/>
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="11.0.2.v20200815-0835"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/babel/update-site/R0.18.2/2020-12/"/>
<unit id="org.eclipse.babel.nls_eclipse_ja.feature.group" version="4.18.0.v20201226020001"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/eclipse/updates/4.18"/>
<unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.1100.v20201107-1818"/>
<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.18.0.v20201026-0947"/>
<unit id="org.eclipse.e4.rcp.feature.group" version="4.18.0.v20201202-1103"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.21.0.v20201107-1818"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.21.0.v20201128-0731"/>
<unit id="org.eclipse.platform.sdk" version="4.18.0.I20201202-1800"/>
<unit id="org.eclipse.rcp.sdk.id" version="4.18.0.I20201202-1800"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/releases/2020-12"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.24.0.v20200917-1439"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.0.0.202006031738"/>
<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="3.0.0.202006031738"/>
<unit id="org.eclipse.swtbot.feature.group" version="3.0.0.202006031738"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="3.0.0.202006031738"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.24.0"/>
<unit id="org.eclipse.xtend.sdk.feature.group" version="2.24.0.v20201130-1016"/>
</location>
</locations>
</target>
55 changes: 26 additions & 29 deletions src/site/markdown/index.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,60 @@
#### [TMD-Makerとは][index]
#### [What's TMD-Maker][index]

[![What TMD-Maker](img/intro.png)][index]
[![What's TMD-Maker](img/intro.png)][index]

TMD-Makerは、佐藤正美氏が考案したTM(T字形ER手法)の表記法であるTMD(T字形ER図)を作成する
オープンソースのTM(T字形ER)ダイアグラム作成ツールです。
TMD-Maker is a OSS tool to create a TMD (T-formed ER diagram). T-formed ER diagram is the notation of the T-formed ER method Mr. Masami Sato was invented.

[ダウンロードする][download]
[Download][download]

#### [TM(T字形ER)について][index]
#### [About TM (T-formed ER)][index]

[![What TM](img/tm.png)][index]
[![What's TM](img/tm.png)][index]

TMとは、ビジネスを解析しながらデータベース構造も同時に作る手法です。
TM is a technique to make the database structure while at the same time to analyze the business.
For more information about TM and TMD, please refer to the [SDI Co., Ltd.][sdi] site.

現在も同氏により定期セミナーやコンサルティング、TM理論の検証が行われています。
TMとTMDのより詳しい情報は[株式会社SDI][sdi]のサイトを参照してください。

#### [属人性を排除したビジネス解析][index]
#### [Business analysis excluding dependency on indivisual skills][index]

[![TM Rule](img/tmrule.png)][index]

TM(T字形ER)は単なる表記法ではなく、ダイアグラムの生成ルールが定義された分析手法です。生成ルールに従うことで属人性を排除したビジネス解析を行うことができます。 TMD-MakerはTM(T字形ER)に準拠しており、表記法だけでなく[生成ルール][tmrule]に従ったダイアグラムが作成できます。
TM (T-formed ER) is not just a notation, but an analysis method that defines the rules for generating diagrams.
By following the generation rules, you can perform business analysis without dependency on indivisual skills.
TMD-Maker is TM (T-formed ER) compliant, and you can create diagrams according to [Generation Rule][tmrule] and as well as notation.

#### [解析結果を元にデータベースを構築][index]
#### [Build a database based on the business analysis results][index]

[![rdbms](img/rdbms.png)][index]

TMD-Makerは、主要なリレーショナルデータベースをはじめとする約20種類のデータベース用のDDLを作成できます。
1つのダイアグラムをビジネス解析、データベース構築、システム開発に利用することができます。[対応データベース一覧へ...][support_rdbms]
TMD-Maker can create DDL for about 20 types of relational databases.
One diagram can be used for business analysis, database construction, and system development. [List of supported databases ...][support_rdbms]

#### [マルチプラットフォーム][index]
#### [Multi platform][index]

[![platform](img/platform.png)][index]

TMD-Makerは、Java実行環境がインストールされているデスクトップPCで利用できます。現在、Windows版、 Mac版、Linux版を提供しています。
また、Eclipse Plugin版も提供しています。[Java実行環境のダウンロードサイトへ...][jre]
TMD-Maker can be used on desktop PCs. We currently provide Windows, Mac, and Linux versions.
We also provide the Eclipse Plugin version.

#### [ダウンロード][index]
#### [Download][index]

[![start tmdmaker](img/download.png)][index]

今すぐTMD-Makerを使ってみましょう。

あなたのお使いのコンピユータにあった実行ファイルを[ダウンロード][download]してください。
Get started with TMD-Maker [now][download].

---

## ダウンロード
## Download

[tmdmakerのダウンロードサイト][download]で各自の環境に合ったファイルを選んでダウンロードしたら、ダウンロードしたファイルを解凍して任意の場所に置く。
Go to [tmdmaker download site][download] and download the file that suits your environment. Unzip the downloaded file and put it in any location.

## 実行
## Run

解凍したフォルダを開いて、tmdmaker.exeをダブルクリックする(mac版はTMD-Maker.app)。
Double-click tmdmaker. (TMD-Maker.app for mac version).


[sdi]: http://www.sdi-net.co.jp
[sdi]: http://www.sdi-net.co.jp/english-index.htm
[index]: index.html
[tmrule]: doc/p2.html
[support_rdbms]: doc/database.html
[download]: https://osdn.net/projects/tmdmaker/releases/
[jre]: https://java.com/ja/download/

Loading

0 comments on commit 89bd61c

Please sign in to comment.