diff options
4 files changed, 73 insertions, 11 deletions
diff --git a/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk b/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk index 463355dc73e3..e32bab8fb161 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk +++ b/testgraphical/ui/java/ConvwatchGUIProject/makefile.mk @@ -1,11 +1,66 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org 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 Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* +PRJ=../../.. -dist/ConvwatchGUIProject.jar: src/*.java -.if $(JDK_VERSION) < 160 - echo "You need at least java 6" - error -.endif +PRJNAME=gfxcmp_ui_java_convwatchgui +TARGET=notargetyet + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- ANT build environment --------------------------------------- + +.INCLUDE : antsettings.mk + +# --- Targets ------------------------------------------------------ + +.INCLUDE : target.mk + +.IF "$(SHOW)" == "" +nothing .PHONY: + +.ELSE + + +ALLTAR: dist/ConvwatchGUIProject.jar + +dist/ConvwatchGUIProject.jar: src/ConvwatchGUI.java src/IniFile.java +# .if $(JDK_VERSION) < 160 +# echo "You need at least java 6" +# error +# .endif +# +# $(ANT) ant +.END + clean: - ant clean + $(ANT) clean + diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java index e8daf5cb0d7d..625e7b80c6e0 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/ConvwatchGUI.java @@ -41,15 +41,15 @@ import javax.swing.SwingWorker; public class ConvwatchGUI extends javax.swing.JFrame { - /** Creates new form ConvwatchGUI - * @param args - */ - private ImageIcon[] m_aImageIcon; private String m_sInifile; private int m_nMaxPages; private int m_nCurrentPage; + /** Creates new form ConvwatchGUI + * @param args + */ + private ConvwatchGUI(String args[]) { if (args.length > 0) diff --git a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java index 2b49ffa760a0..20cede5b1c33 100644 --- a/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java +++ b/testgraphical/ui/java/ConvwatchGUIProject/src/IniFile.java @@ -387,7 +387,7 @@ public class IniFile implements Enumeration * @param _sSection * @param _sKey * @param _nDefault if there is a problem, key not found... this value will return - * @return + * @return the value as integer if possible to convert, if not return default value. */ public int getIntValue(String _sSection, String _sKey, int _nDefault) { diff --git a/testgraphical/ui/java/makefile.mk b/testgraphical/ui/java/makefile.mk index a58cf9d4ac69..134787a17a08 100644 --- a/testgraphical/ui/java/makefile.mk +++ b/testgraphical/ui/java/makefile.mk @@ -38,9 +38,16 @@ TARGET=notargetyet .INCLUDE : target.mk +.IF "$(SHOW)" == "" +nothing .PHONY: + +.ELSE + # PERLDEBUG=-d:ptkdb ALLTAR: $(COPY) ConvwatchGUIProject$/dist/ConvwatchGUIProject.jar $(CLASSDIR) +.END + .INCLUDE : $(PRJ)$/util$/makefile.pmk |