OSDN > Trouver un logiciel > aoiro > SCM > SVN > Commit

aoiro

aoiro: Commit

* aoiro 0.7
依存ライブラリ pdf-brewer のバージョンを0.4.2に変更しました。これによりPDFのプロパティに設定される作成アプリケーション名がaoiroと表示されるようになりました。

--- aoiro/trunk/src/main/java/net/osdn/aoiro/Util.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/Util.java (revision 49)

		@@ -12,6 +12,9 @@
12	12
13	13	private static File appDir;
14	14	private static Locale locale = new Locale("ja", "JP", "JP");
	15	+
	16	+ private static String pdfCreatorName;
	17	+ private static String pdfCreatorVersion;
15	18
16	19	public static File getApplicationDirectory() {
17	20	if(appDir == null) {

		@@ -59,8 +62,34 @@
59	62	}
60	63	return version;
61	64	}
62		-
63		- public static Locale getLocale() {
64		- return locale;
	65	+
	66	+ public static void setPdfCreator(String name, String version) {
	67	+ Util.pdfCreatorName = name;
	68	+ Util.pdfCreatorVersion = version;
65	69	}
	70	+
	71	+ public static String getPdfCreator() {
	72	+ String name = Util.pdfCreatorName;
	73	+ if(name == null) {
	74	+ name = "aoiro";
	75	+ }
	76	+ String version = Util.pdfCreatorVersion;
	77	+ if(version == null) {
	78	+ int[] v = getApplicationVersion();
	79	+ if(v != null) {
	80	+ if(v[2] == 0 && v[3] == 0) {
	81	+ version = String.format("%d.%d", v[0], v[1]);
	82	+ } else if(v[3] == 0) {
	83	+ version = String.format("%d.%d.%d", v[0], v[1], v[2]);
	84	+ } else {
	85	+ version = String.format("%d.%d.%d.%d", v[0], v[1], v[2], v[3]);
	86	+ }
	87	+ }
	88	+ }
	89	+ if(version == null \|\| version.isBlank()) {
	90	+ return name;
	91	+ } else {
	92	+ return name + " " + version;
	93	+ }
	94	+ }
66	95	}

--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/BalanceSheet.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/BalanceSheet.java (revision 49)

		@@ -22,6 +22,7 @@
22	22	import java.util.Set;
23	23
24	24	import net.osdn.aoiro.AccountSettlement;
	25	+import net.osdn.aoiro.Util;
25	26	import net.osdn.aoiro.model.AccountTitle;
26	27	import net.osdn.aoiro.model.AccountType;
27	28	import net.osdn.aoiro.model.Amount;

		@@ -690,6 +691,7 @@
690	691	prepare();
691	692
692	693	PdfBrewer brewer = new PdfBrewer();
	694	+ brewer.setCreator(Util.getPdfCreator());
693	695	BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
694	696	brewer.setTitle("貸借対照表");
695	697	brewer.process(pb);

--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralJournal.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralJournal.java (revision 49)

		@@ -11,6 +11,7 @@
11	11	import java.util.List;
12	12
13	13	import net.osdn.aoiro.AccountSettlement;
	14	+import net.osdn.aoiro.Util;
14	15	import net.osdn.aoiro.model.Creditor;
15	16	import net.osdn.aoiro.model.Debtor;
16	17	import net.osdn.aoiro.model.JournalEntry;

		@@ -348,6 +349,7 @@
348	349	prepare();
349	350
350	351	PdfBrewer brewer = new PdfBrewer();
	352	+ brewer.setCreator(Util.getPdfCreator());
351	353	BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
352	354	brewer.setTitle("仕訳帳");
353	355	brewer.process(pb);

--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralLedger.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/GeneralLedger.java (revision 49)

		@@ -13,6 +13,7 @@
13	13	import java.util.Set;
14	14
15	15	import net.osdn.aoiro.AccountSettlement;
	16	+import net.osdn.aoiro.Util;
16	17	import net.osdn.aoiro.model.Account;
17	18	import net.osdn.aoiro.model.AccountTitle;
18	19	import net.osdn.aoiro.model.AccountType;

		@@ -558,6 +559,7 @@
558	559	prepare();
559	560
560	561	PdfBrewer brewer = new PdfBrewer();
	562	+ brewer.setCreator(Util.getPdfCreator());
561	563	BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
562	564	brewer.setTitle("総勘定元帳");
563	565	brewer.process(pb);

--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/ProfitAndLoss.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/ProfitAndLoss.java (revision 49)

		@@ -20,6 +20,7 @@
20	20	import java.util.Set;
21	21
22	22	import net.osdn.aoiro.AccountSettlement;
	23	+import net.osdn.aoiro.Util;
23	24	import net.osdn.aoiro.model.AccountTitle;
24	25	import net.osdn.aoiro.model.Amount;
25	26	import net.osdn.aoiro.model.Creditor;

		@@ -501,6 +502,7 @@
501	502	prepare();
502	503
503	504	PdfBrewer brewer = new PdfBrewer();
	505	+ brewer.setCreator(Util.getPdfCreator());
504	506	BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
505	507	brewer.setTitle("損益計算書");
506	508	brewer.process(pb);

--- aoiro/trunk/src/main/java/net/osdn/aoiro/report/StatementOfChangesInEquity.java (revision 48)

+++ aoiro/trunk/src/main/java/net/osdn/aoiro/report/StatementOfChangesInEquity.java (revision 49)

		@@ -22,6 +22,7 @@
22	22	import java.util.Set;
23	23
24	24	import net.osdn.aoiro.AccountSettlement;
	25	+import net.osdn.aoiro.Util;
25	26	import net.osdn.aoiro.model.AccountTitle;
26	27	import net.osdn.aoiro.model.AccountType;
27	28	import net.osdn.aoiro.model.Amount;

		@@ -460,6 +461,7 @@
460	461	prepare();
461	462
462	463	PdfBrewer brewer = new PdfBrewer();
	464	+ brewer.setCreator(Util.getPdfCreator());
463	465	BrewerData pb = new BrewerData(printData, brewer.getFontLoader());
464	466	brewer.setTitle("社員資本等変動計算書");
465	467	brewer.process(pb);