Skip to content

Commit

Permalink
Added log4j_file and set as default appender in RunWoped.main
Browse files Browse the repository at this point in the history
  • Loading branch information
ChelloX committed Oct 25, 2020
1 parent d377d6d commit c54bfdd
Show file tree
Hide file tree
Showing 7 changed files with 213 additions and 239 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,5 @@ nb-configuration.xml
## WoPeD
##############################
WoPeD.exe
WoPeD-Starter.jar
WoPeD-Starter.jar
woped.log
18 changes: 12 additions & 6 deletions WoPeD-IzPack/InstallFiles/install.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@
</locale>

<resources>
<res id="LicencePanel.licence" src="License.txt"></res>
<res id="InfoPanel.info" src="Readme.txt"></res>
<res id="LicencePanel.licence" src="License.txt" />
<res id="InfoPanel.info" src="Readme.txt" />
<res id="Installer.image.0" src="helloPanel.png" />
<res id="Installer.image.1" src="infoPanel.png" />
<res id="Installer.image.2" src="licencePanel.png" />
<res id="Installer.image.3" src="packsPanel.png" />
<res id="Installer.image.4" src="targetPanel.png" />
<res id="Installer.image.5" src="installPanel.png" />
<res id="Installer.image.6" src="shortcutPanel.png" />
<res id="ProcessPanel.Spec.xml" src="process.xml" />
<res id="Installer.image.5" src="installPanel.png" />
<res id="Installer.image.7" src="finishPanel.png" />
<res id="installer.langsel.img" src="WoPeD-logo.jpg" />
<res id="packsLang.xml_eng" src="install-eng.xml" />
Expand All @@ -67,9 +66,8 @@
<panel classname="LicencePanel"></panel>
<panel classname="TargetPanel"></panel>
<panel classname="PacksPanel"></panel>
<panel classname="InstallPanel"></panel>
<panel classname="ShortcutPanel"></panel>
<panel classname="ProcessPanel"></panel>
<panel classname="InstallPanel"></panel>
<panel classname="SimpleFinishPanel"></panel>
</panels>

Expand All @@ -82,6 +80,7 @@
<include name="Readme.txt" />
<include name="License.txt" />
<include name="Changelog.txt" />
<include name="runWoPeD.cmd" />
<os family="windows" />
</fileset>
<fileset dir="." targetdir="${INSTALL_PATH}" override="true">
Expand Down Expand Up @@ -113,5 +112,12 @@
</fileset>
</pack>

<!-- <pack name="RunWoped" required="true" id="id4" hidden="true"> <description>
Test </description> <executable targetfile="$INSTALL_PATH/Woped.exe" type="bin"
stage="postinstall" failure="warn" keep="true"> <os family="windows" /> <args>
<arg value="-delay" /> </args> </executable> <executable targetfile="$INSTALL_PATH/Woped-Starter.jar"
type="jar" class="org.woped.starter.RunWoPeD" stage="postinstall" failure="warn"
keep="true"> <os family="unix" /> <args> <arg value="-delay" /> </args> </executable>
</pack> -->
</packs>
</izpack:installation>
48 changes: 30 additions & 18 deletions WoPeD-Starter/src/main/java/org/woped/starter/RunWoPeD.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.awt.*;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.Locale;

import javax.swing.JFrame;
Expand Down Expand Up @@ -66,10 +67,12 @@ public class RunWoPeD extends JFrame {
*
*/
public static void main(String[] args) {

boolean startDelayed = false;
boolean forceGerman = false;
boolean forceEnglish = false;
boolean logTofile = true;


for (String arg : args) {

Expand All @@ -82,17 +85,20 @@ public static void main(String[] args) {
if (arg.equals("-english")) {
forceEnglish = true;
}
if(arg.equals("-ide")) {
logTofile = false;
}
}

if (startDelayed || forceGerman || forceEnglish)
if (startDelayed || forceGerman || forceEnglish || !logTofile)
args = null;

if (forceGerman)
Locale.setDefault(Locale.GERMANY);
if (forceEnglish)
Locale.setDefault(Locale.ENGLISH);

m_instance = new RunWoPeD(args);
m_instance = new RunWoPeD(args, logTofile);

if (startDelayed) {
m_instance.WaitForSetupFinished();
Expand All @@ -104,12 +110,12 @@ public static void main(String[] args) {
/**
* Constructor
**/
private RunWoPeD(String[] args) {
private RunWoPeD(String[] args, boolean logToFile) {
m_filesToOpen = args;

initLogging();
initLogging(logToFile);
m_dam = new DefaultApplicationMediator(null, new WoPeDGeneralConfiguration());

initUI();
}

Expand All @@ -121,18 +127,19 @@ private void initUI() {
if (Platform.isMac()) {
Desktop d = Desktop.getDesktop();

d.setOpenFileHandler(e ->{
m_filesToOpen = new String[1];
m_filesToOpen[0] = e.getFiles().get(0).getAbsolutePath();});
d.setOpenFileHandler(e -> {
m_filesToOpen = new String[1];
m_filesToOpen[0] = e.getFiles().get(0).getAbsolutePath();
});

d.setQuitHandler((e,r)->m_dam.fireViewEvent(
new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_GUI, AbstractViewEvent.EXIT)));
d.setQuitHandler((e, r) -> m_dam
.fireViewEvent(new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_GUI, AbstractViewEvent.EXIT)));

d.setAboutHandler(e->m_dam.fireViewEvent(
new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_GUI, AbstractViewEvent.ABOUT)));
d.setAboutHandler(e -> m_dam
.fireViewEvent(new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_GUI, AbstractViewEvent.ABOUT)));

d.setPreferencesHandler(e->m_dam.fireViewEvent(new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_APPLICATION,
AbstractViewEvent.CONFIG)));
d.setPreferencesHandler(e -> m_dam.fireViewEvent(
new ViewEvent(m_dam, AbstractViewEvent.VIEWEVENTTYPE_APPLICATION, AbstractViewEvent.CONFIG)));
}

System.setProperty("apple.laf.useScreenMenuBar", "true");
Expand All @@ -157,11 +164,16 @@ private void initUI() {

/**
* Init loggers for different WoPeD components
* @param logToFile
**/
private void initLogging() {

DOMConfigurator.configure(RunWoPeD.class.getResource("/log4j.xml"));
private void initLogging(boolean logToFile) {

if(logToFile) {
DOMConfigurator.configure(RunWoPeD.class.getResource("/log4j_file.xml"));
} else {
DOMConfigurator.configure(RunWoPeD.class.getResource("/log4j_console.xml"));
}

LoggerManager.register(new WopedLogger(org.apache.log4j.Logger.getLogger(Constants.GUI_LOGGER)),
Constants.GUI_LOGGER);
LoggerManager.register(
Expand Down
107 changes: 0 additions & 107 deletions WoPeD-Starter/src/main/java/org/woped/starter/utilities/log4j.xml

This file was deleted.

107 changes: 0 additions & 107 deletions WoPeD-Starter/src/main/resources/log4j.xml

This file was deleted.

Loading

0 comments on commit c54bfdd

Please sign in to comment.