From 1dea0166805378a32a05a43ff2aff3d5f5285942 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Tue, 4 Feb 2014 19:00:36 +0100 Subject: [PATCH] Normalize copyright headers. --- .settings/com.wdev91.eclipse.copyright.xml | 59 +++ demo/XidynDemo.java | 18 +- src/fr/devinsy/xidyn/data/SimpleTagData.java | 370 +++++++++--------- src/fr/devinsy/xidyn/data/TagAttributes.java | 18 + src/fr/devinsy/xidyn/data/TagData.java | 18 + .../devinsy/xidyn/data/TagDataListById.java | 18 + .../xidyn/data/TagDataListByIndex.java | 18 + src/fr/devinsy/xidyn/data/TagDataManager.java | 18 + .../xidyn/presenters/DomPresenter.java | 18 + .../xidyn/presenters/DomPresenterCore.java | 18 + .../xidyn/presenters/FilePresenter.java | 20 +- .../xidyn/presenters/FilePresenters.java | 22 +- .../xidyn/presenters/FilePresentersProxy.java | 18 + .../xidyn/presenters/GenericPresenter.java | 18 + .../devinsy/xidyn/presenters/Presenter.java | 18 + .../xidyn/presenters/PresenterFactory.java | 18 + .../xidyn/presenters/StringPresenter.java | 22 +- .../xidyn/presenters/TranslatorPresenter.java | 22 +- .../xidyn/presenters/URLPresenter.java | 20 +- .../xidyn/utils/ParserErrorHandler.java | 28 +- src/fr/devinsy/xidyn/utils/XidynUtils.java | 18 + src/fr/devinsy/xidyn/views/CharterView.java | 18 + src/fr/devinsy/xidyn/views/View.java | 21 +- test/Foo.java | 18 + test/XidynTest.java | 18 +- .../xidyn/presenters/DomPresenterTest.java | 18 + .../xidyn/presenters/StringPresenterTest.java | 18 + .../devinsy/xidyn/utils/XidynUtilsTest.java | 18 + 28 files changed, 729 insertions(+), 197 deletions(-) create mode 100644 .settings/com.wdev91.eclipse.copyright.xml diff --git a/.settings/com.wdev91.eclipse.copyright.xml b/.settings/com.wdev91.eclipse.copyright.xml new file mode 100644 index 0000000..01c6af2 --- /dev/null +++ b/.settings/com.wdev91.eclipse.copyright.xml @@ -0,0 +1,59 @@ + + + + ]]> +
+
+
+
+
+
+ + + ]]> + ]]> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+ + + +
+ diff --git a/demo/XidynDemo.java b/demo/XidynDemo.java index 422084c..edb4f5e 100644 --- a/demo/XidynDemo.java +++ b/demo/XidynDemo.java @@ -1,7 +1,21 @@ /** - * XidDemo + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see */ - import org.apache.log4j.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/fr/devinsy/xidyn/data/SimpleTagData.java b/src/fr/devinsy/xidyn/data/SimpleTagData.java index 00dc024..326e772 100644 --- a/src/fr/devinsy/xidyn/data/SimpleTagData.java +++ b/src/fr/devinsy/xidyn/data/SimpleTagData.java @@ -1,176 +1,194 @@ -package fr.devinsy.xidyn.data; - -import java.io.Serializable; - -/** - * IdData class is used to hold application data and the business logic that - * operates on the data. - * - * The only requirement of a IdData class is that it must implement a display - * method. The display method must return a text representation of the data, - * suitable for display in a web page. - * - * XID provides a User Input IdData, Text IdData and ... application may also - * implement it's own IdData classes. - * - */ -public class SimpleTagData implements Serializable, TagData -{ - public enum IterationStrategy - { - ONLY_FIRST_ROW, ONLY_FIRST_TWO_ROWS, ONLY_ROWS_WITH_ID, ONLY_ROWS_WITHOUT_ID, ALL_ROWS - } - - public enum MODE - { - REPLACE, APPEND, IGNORE - } - - private static final long serialVersionUID = 8976245034682639923L;; - - private IterationStrategy iterationStrategy; - private TagAttributes attributes; - private boolean excludeSection; - private MODE displayMode = MODE.REPLACE; - private String content; - - /** - * - */ - public SimpleTagData() - { - this.attributes = null; - this.excludeSection = false; - this.displayMode = MODE.REPLACE; - this.content = null; - this.iterationStrategy = IterationStrategy.ALL_ROWS; - } - - /** - * - */ - public SimpleTagData(final String text) - { - this.attributes = null; - this.excludeSection = false; - this.displayMode = MODE.REPLACE; - this.content = text; - this.iterationStrategy = IterationStrategy.ALL_ROWS; - } - - /** - * - */ - public void appendContent(final String text) - { - if (this.content == null) - { - this.content = text; - } - else - { - this.content += text; - } - } - - /** - * - */ - public TagAttributes attributes() - { - TagAttributes result; - - if (this.attributes == null) - { - this.attributes = new TagAttributes(); - } - - result = this.attributes; - - // - return (result); - } - - /** - * - */ - public String display() - { - String result; - - result = this.content; - - // - return (result); - } - - /** - * - */ - public MODE displayMode() - { - MODE result; - - result = this.displayMode; - - return (result); - } - - /** - * - */ - public boolean excludeSection() - { - boolean result; - - result = excludeSection; - - // - return (result); - } - - /** - * - */ - public IterationStrategy iterationStrategy() - { - IterationStrategy result; - - result = this.iterationStrategy; - - // - return (result); - } - - /** - * - */ - public void setContent(final String text) - { - this.content = text; - } - - /** - * - */ - public void setDisplayMode(final MODE displayMode) - { - this.displayMode = displayMode; - } - - /** - * - */ - public void setExcludeSection(final boolean excludeSection) - { - this.excludeSection = excludeSection; - } - - /** - * - */ - public void setIterationStrategy(final IterationStrategy strategy) - { - this.iterationStrategy = strategy; - } -} +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ +package fr.devinsy.xidyn.data; + +import java.io.Serializable; + +/** + * IdData class is used to hold application data and the business logic that + * operates on the data. + * + * The only requirement of a IdData class is that it must implement a display + * method. The display method must return a text representation of the data, + * suitable for display in a web page. + * + * XID provides a User Input IdData, Text IdData and ... application may also + * implement it's own IdData classes. + * + */ +public class SimpleTagData implements Serializable, TagData +{ + public enum IterationStrategy + { + ONLY_FIRST_ROW, ONLY_FIRST_TWO_ROWS, ONLY_ROWS_WITH_ID, ONLY_ROWS_WITHOUT_ID, ALL_ROWS + } + + public enum MODE + { + REPLACE, APPEND, IGNORE + } + + private static final long serialVersionUID = 8976245034682639923L;; + + private IterationStrategy iterationStrategy; + private TagAttributes attributes; + private boolean excludeSection; + private MODE displayMode = MODE.REPLACE; + private String content; + + /** + * + */ + public SimpleTagData() + { + this.attributes = null; + this.excludeSection = false; + this.displayMode = MODE.REPLACE; + this.content = null; + this.iterationStrategy = IterationStrategy.ALL_ROWS; + } + + /** + * + */ + public SimpleTagData(final String text) + { + this.attributes = null; + this.excludeSection = false; + this.displayMode = MODE.REPLACE; + this.content = text; + this.iterationStrategy = IterationStrategy.ALL_ROWS; + } + + /** + * + */ + public void appendContent(final String text) + { + if (this.content == null) + { + this.content = text; + } + else + { + this.content += text; + } + } + + /** + * + */ + public TagAttributes attributes() + { + TagAttributes result; + + if (this.attributes == null) + { + this.attributes = new TagAttributes(); + } + + result = this.attributes; + + // + return (result); + } + + /** + * + */ + public String display() + { + String result; + + result = this.content; + + // + return (result); + } + + /** + * + */ + public MODE displayMode() + { + MODE result; + + result = this.displayMode; + + return (result); + } + + /** + * + */ + public boolean excludeSection() + { + boolean result; + + result = this.excludeSection; + + // + return (result); + } + + /** + * + */ + public IterationStrategy iterationStrategy() + { + IterationStrategy result; + + result = this.iterationStrategy; + + // + return (result); + } + + /** + * + */ + public void setContent(final String text) + { + this.content = text; + } + + /** + * + */ + public void setDisplayMode(final MODE displayMode) + { + this.displayMode = displayMode; + } + + /** + * + */ + public void setExcludeSection(final boolean excludeSection) + { + this.excludeSection = excludeSection; + } + + /** + * + */ + public void setIterationStrategy(final IterationStrategy strategy) + { + this.iterationStrategy = strategy; + } +} diff --git a/src/fr/devinsy/xidyn/data/TagAttributes.java b/src/fr/devinsy/xidyn/data/TagAttributes.java index d7cb754..ee52ca9 100644 --- a/src/fr/devinsy/xidyn/data/TagAttributes.java +++ b/src/fr/devinsy/xidyn/data/TagAttributes.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.data; import java.util.HashMap; diff --git a/src/fr/devinsy/xidyn/data/TagData.java b/src/fr/devinsy/xidyn/data/TagData.java index aa7d332..1e3618c 100644 --- a/src/fr/devinsy/xidyn/data/TagData.java +++ b/src/fr/devinsy/xidyn/data/TagData.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.data; /* diff --git a/src/fr/devinsy/xidyn/data/TagDataListById.java b/src/fr/devinsy/xidyn/data/TagDataListById.java index 10bc51a..711cd54 100644 --- a/src/fr/devinsy/xidyn/data/TagDataListById.java +++ b/src/fr/devinsy/xidyn/data/TagDataListById.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.data; import java.util.HashMap; diff --git a/src/fr/devinsy/xidyn/data/TagDataListByIndex.java b/src/fr/devinsy/xidyn/data/TagDataListByIndex.java index f67ffbc..5f37d84 100644 --- a/src/fr/devinsy/xidyn/data/TagDataListByIndex.java +++ b/src/fr/devinsy/xidyn/data/TagDataListByIndex.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.data; import java.util.Vector; diff --git a/src/fr/devinsy/xidyn/data/TagDataManager.java b/src/fr/devinsy/xidyn/data/TagDataManager.java index d9c702d..34aa94e 100644 --- a/src/fr/devinsy/xidyn/data/TagDataManager.java +++ b/src/fr/devinsy/xidyn/data/TagDataManager.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.data; /* diff --git a/src/fr/devinsy/xidyn/presenters/DomPresenter.java b/src/fr/devinsy/xidyn/presenters/DomPresenter.java index 85e4ea1..9c8eec5 100644 --- a/src/fr/devinsy/xidyn/presenters/DomPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/DomPresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.StringWriter; diff --git a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java index 63ceefe..f7efb65 100644 --- a/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java +++ b/src/fr/devinsy/xidyn/presenters/DomPresenterCore.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.StringWriter; diff --git a/src/fr/devinsy/xidyn/presenters/FilePresenter.java b/src/fr/devinsy/xidyn/presenters/FilePresenter.java index 93136ee..6f2d879 100644 --- a/src/fr/devinsy/xidyn/presenters/FilePresenter.java +++ b/src/fr/devinsy/xidyn/presenters/FilePresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.File; @@ -228,7 +246,7 @@ public class FilePresenter extends StringPresenter logger.error(errorMessage); throw new NullPointerException(errorMessage); } - else if (!source.exists()) + else if (!this.source.exists()) { String errorMessage = "source file defined but not found (" + this.sourceFilePathname + ")"; logger.error(errorMessage); diff --git a/src/fr/devinsy/xidyn/presenters/FilePresenters.java b/src/fr/devinsy/xidyn/presenters/FilePresenters.java index 50560cc..ea61fae 100644 --- a/src/fr/devinsy/xidyn/presenters/FilePresenters.java +++ b/src/fr/devinsy/xidyn/presenters/FilePresenters.java @@ -1,9 +1,21 @@ -/* - * Copyright 2009 Christian Momon, All rights reserved. - * This file is free software under the terms of the GNU Library General Public License - * as published by the Free Software Foundation version 2 or any later version. +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see */ - package fr.devinsy.xidyn.presenters; import java.util.Vector; diff --git a/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java b/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java index ef1c902..1bf00c8 100644 --- a/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java +++ b/src/fr/devinsy/xidyn/presenters/FilePresentersProxy.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import org.slf4j.Logger; diff --git a/src/fr/devinsy/xidyn/presenters/GenericPresenter.java b/src/fr/devinsy/xidyn/presenters/GenericPresenter.java index 1d65b8a..9eba003 100644 --- a/src/fr/devinsy/xidyn/presenters/GenericPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/GenericPresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.File; diff --git a/src/fr/devinsy/xidyn/presenters/Presenter.java b/src/fr/devinsy/xidyn/presenters/Presenter.java index 7306ab1..365ad1c 100644 --- a/src/fr/devinsy/xidyn/presenters/Presenter.java +++ b/src/fr/devinsy/xidyn/presenters/Presenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import fr.devinsy.xidyn.data.TagDataManager; diff --git a/src/fr/devinsy/xidyn/presenters/PresenterFactory.java b/src/fr/devinsy/xidyn/presenters/PresenterFactory.java index 0aa2ffc..29144b0 100644 --- a/src/fr/devinsy/xidyn/presenters/PresenterFactory.java +++ b/src/fr/devinsy/xidyn/presenters/PresenterFactory.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.File; diff --git a/src/fr/devinsy/xidyn/presenters/StringPresenter.java b/src/fr/devinsy/xidyn/presenters/StringPresenter.java index 2497455..55bee56 100644 --- a/src/fr/devinsy/xidyn/presenters/StringPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/StringPresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.StringWriter; @@ -76,7 +94,7 @@ public class StringPresenter implements Presenter if (this.doctype == null) { - StringBuffer buffer = new StringBuffer(source.length() + 100); + StringBuffer buffer = new StringBuffer(this.source.length() + 100); buffer.append("\n"); buffer.append(this.source); buffer.append(""); @@ -109,7 +127,7 @@ public class StringPresenter implements Presenter htmlCode.write(this.doctype); } - DomPresenterCore.dynamize(htmlCode, dom, data); + DomPresenterCore.dynamize(htmlCode, this.dom, data); StringBuffer htmlTarget = htmlCode.getBuffer(); // diff --git a/src/fr/devinsy/xidyn/presenters/TranslatorPresenter.java b/src/fr/devinsy/xidyn/presenters/TranslatorPresenter.java index e569f8d..7278cc2 100644 --- a/src/fr/devinsy/xidyn/presenters/TranslatorPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/TranslatorPresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.util.HashMap; @@ -207,7 +225,7 @@ public class TranslatorPresenter implements Presenter } else { - String adaptedSource = FileTools.addBeforeExtension(defaultSource, "-" + language); + String adaptedSource = FileTools.addBeforeExtension(this.defaultSource, "-" + language); result = PresenterFactory.get(adaptedSource); if (result.isAvailable()) @@ -216,7 +234,7 @@ public class TranslatorPresenter implements Presenter } else { - adaptedSource = FileTools.addBeforeExtension(defaultSource, "_" + language); + adaptedSource = FileTools.addBeforeExtension(this.defaultSource, "_" + language); if (result.isAvailable()) { diff --git a/src/fr/devinsy/xidyn/presenters/URLPresenter.java b/src/fr/devinsy/xidyn/presenters/URLPresenter.java index 8511c7b..05c7f69 100644 --- a/src/fr/devinsy/xidyn/presenters/URLPresenter.java +++ b/src/fr/devinsy/xidyn/presenters/URLPresenter.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import java.io.IOException; @@ -125,7 +143,7 @@ public class URLPresenter extends StringPresenter { result = false; } - else if (sourcePathname.startsWith("/")) + else if (this.sourcePathname.startsWith("/")) { /* * In case of Jar resources, if resource does not exist then diff --git a/src/fr/devinsy/xidyn/utils/ParserErrorHandler.java b/src/fr/devinsy/xidyn/utils/ParserErrorHandler.java index 0f3e813..17d77c1 100644 --- a/src/fr/devinsy/xidyn/utils/ParserErrorHandler.java +++ b/src/fr/devinsy/xidyn/utils/ParserErrorHandler.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.utils; import java.util.Vector; @@ -22,10 +40,10 @@ public class ParserErrorHandler implements ErrorHandler public ParserErrorHandler() { - fatalErrorsCount = 0; - errorsCount = 0; - warningCount = 0; - messages = new Vector(); + this.fatalErrorsCount = 0; + this.errorsCount = 0; + this.warningCount = 0; + this.messages = new Vector(); } /** @@ -130,7 +148,7 @@ public class ParserErrorHandler implements ErrorHandler result = new StringBuffer(); - for (String message : messages) + for (String message : this.messages) { result.append(message); result.append('\n'); diff --git a/src/fr/devinsy/xidyn/utils/XidynUtils.java b/src/fr/devinsy/xidyn/utils/XidynUtils.java index 923007f..6241b31 100644 --- a/src/fr/devinsy/xidyn/utils/XidynUtils.java +++ b/src/fr/devinsy/xidyn/utils/XidynUtils.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.utils; import java.io.BufferedReader; diff --git a/src/fr/devinsy/xidyn/views/CharterView.java b/src/fr/devinsy/xidyn/views/CharterView.java index 5031436..b4314dd 100644 --- a/src/fr/devinsy/xidyn/views/CharterView.java +++ b/src/fr/devinsy/xidyn/views/CharterView.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.views; import java.util.Locale; diff --git a/src/fr/devinsy/xidyn/views/View.java b/src/fr/devinsy/xidyn/views/View.java index 24ef458..ffa1fa3 100644 --- a/src/fr/devinsy/xidyn/views/View.java +++ b/src/fr/devinsy/xidyn/views/View.java @@ -1,9 +1,28 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.views; /** * */ -public interface View { +public interface View +{ /** * */ diff --git a/test/Foo.java b/test/Foo.java index 57fed3b..326e76f 100644 --- a/test/Foo.java +++ b/test/Foo.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ import org.w3c.dom.Document; import fr.devinsy.xidyn.utils.XidynUtils; diff --git a/test/XidynTest.java b/test/XidynTest.java index d72157f..cb9a531 100644 --- a/test/XidynTest.java +++ b/test/XidynTest.java @@ -1,7 +1,21 @@ /** - * XidTest. + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see */ - import org.apache.log4j.Level; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/fr/devinsy/xidyn/presenters/DomPresenterTest.java b/test/fr/devinsy/xidyn/presenters/DomPresenterTest.java index 0c8ff90..f955292 100644 --- a/test/fr/devinsy/xidyn/presenters/DomPresenterTest.java +++ b/test/fr/devinsy/xidyn/presenters/DomPresenterTest.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import org.apache.log4j.BasicConfigurator; diff --git a/test/fr/devinsy/xidyn/presenters/StringPresenterTest.java b/test/fr/devinsy/xidyn/presenters/StringPresenterTest.java index 301b0ce..3884b74 100644 --- a/test/fr/devinsy/xidyn/presenters/StringPresenterTest.java +++ b/test/fr/devinsy/xidyn/presenters/StringPresenterTest.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.presenters; import org.apache.log4j.BasicConfigurator; diff --git a/test/fr/devinsy/xidyn/utils/XidynUtilsTest.java b/test/fr/devinsy/xidyn/utils/XidynUtilsTest.java index 069b608..a1b34f5 100644 --- a/test/fr/devinsy/xidyn/utils/XidynUtilsTest.java +++ b/test/fr/devinsy/xidyn/utils/XidynUtilsTest.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2006-2014 Christian Pierre MOMON + * + * This file is part of Xidyn. + * + * Xidyn is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Xidyn 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Xidyn. If not, see + */ package fr.devinsy.xidyn.utils; import org.apache.log4j.BasicConfigurator;