Update of /cvsroot/genj/dev/src/core/genj/report
In directory sc8-pr-cvs1:/tmp/cvs-serv28245/src/core/genj/report
Modified Files:
Report.java
Log Message:
make protected methods public - everyone can use 'em
Index: Report.java
===================================================================
RCS file: /cvsroot/genj/dev/src/core/genj/report/Report.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Report.java 17 Jun 2003 00:36:07 -0000 1.22
--- Report.java 17 Jun 2003 21:54:25 -0000 1.23
***************
*** 189,193 ****
* Flush any of the pending output
*/
! protected final void flush() {
if (out!=null)
out.flush();
--- 189,193 ----
* Flush any of the pending output
*/
! public final void flush() {
if (out!=null)
out.flush();
***************
*** 197,201 ****
* Append a new line to the log
*/
! protected final void println() throws ReportCancelledException {
println("");
}
--- 197,201 ----
* Append a new line to the log
*/
! public final void println() throws ReportCancelledException {
println("");
}
***************
*** 204,208 ****
* Write an arbitrary Object to the log
*/
! protected final void println(Object o) throws ReportCancelledException {
// nothing to do?
if (o==null)
--- 204,208 ----
* Write an arbitrary Object to the log
*/
! public final void println(Object o) throws ReportCancelledException {
// nothing to do?
if (o==null)
***************
*** 219,223 ****
* log an exception
*/
! protected final void println(Throwable t) {
CharArrayWriter awriter = new CharArrayWriter(256);
t.printStackTrace(new PrintWriter(awriter));
--- 219,223 ----
* log an exception
*/
! public final void println(Throwable t) {
CharArrayWriter awriter = new CharArrayWriter(256);
t.printStackTrace(new PrintWriter(awriter));
***************
*** 228,232 ****
* Helper method that queries the user for a directory
*/
! protected final File getDirectoryFromUser(String title, String button) {
JFileChooser chooser = new JFileChooser(".");
--- 228,232 ----
* Helper method that queries the user for a directory
*/
! public final File getDirectoryFromUser(String title, String button) {
JFileChooser chooser = new JFileChooser(".");
***************
*** 243,247 ****
* Helper method that shows (resulting) items to the user
*/
! protected final void showItemsToUser(String msg, Gedcom gedcom, Item[] items) {
// prepare content
--- 243,247 ----
* Helper method that shows (resulting) items to the user
*/
! public final void showItemsToUser(String msg, Gedcom gedcom, Item[] items) {
// prepare content
***************
*** 269,273 ****
* @param sortPath path to sort by or null
*/
! protected final Entity getEntityFromUser(String msg, Gedcom gedcom, String tag, String sortPath) {
// grab entities
Object[] ents = gedcom.getEntities(tag).toArray();
--- 269,273 ----
* @param sortPath path to sort by or null
*/
! public final Entity getEntityFromUser(String msg, Gedcom gedcom, String tag, String sortPath) {
// grab entities
Object[] ents = gedcom.getEntities(tag).toArray();
***************
*** 284,288 ****
* Helper method that queries the user for a choice of non-editable items
*/
! protected final Object getValueFromUser(String msg, Object[] choices, Object selected) {
ChoiceWidget choice = new ChoiceWidget(choices, selected);
--- 284,288 ----
* Helper method that queries the user for a choice of non-editable items
*/
! public final Object getValueFromUser(String msg, Object[] choices, Object selected) {
ChoiceWidget choice = new ChoiceWidget(choices, selected);
***************
*** 305,309 ****
* choice of remembered values
*/
! protected final String getValueFromUser(String key, String msg, String[] choices) {
// Choice to include already entered stuff?
--- 305,309 ----
* choice of remembered values
*/
! public final String getValueFromUser(String key, String msg, String[] choices) {
// Choice to include already entered stuff?
***************
*** 352,356 ****
* Helper method that queries the user for yes/no input
*/
! protected final boolean getOptionFromUser(String msg, int option) {
return 0==getOptionFromUser(msg, OPTIONS[option]);
}
--- 352,356 ----
* Helper method that queries the user for yes/no input
*/
! public final boolean getOptionFromUser(String msg, int option) {
return 0==getOptionFromUser(msg, OPTIONS[option]);
}
***************
*** 359,363 ****
* Helper method that queries the user for yes/no input
*/
! protected final int getOptionFromUser(String msg, String[] options) {
return viewManager.getWindowManager().openDialog(
--- 359,363 ----
* Helper method that queries the user for yes/no input
*/
! public final int getOptionFromUser(String msg, String[] options) {
return viewManager.getWindowManager().openDialog(
***************
*** 376,380 ****
* i18n of a string
*/
! protected final String i18n(String key) {
return i18n(key, (Object[])null);
}
--- 376,380 ----
* i18n of a string
*/
! public final String i18n(String key) {
return i18n(key, (Object[])null);
}
***************
*** 383,387 ****
* i18n of a string
*/
! protected final String i18n(String key, int sub) {
return i18n(key, new Integer(sub));
}
--- 383,387 ----
* i18n of a string
*/
! public final String i18n(String key, int sub) {
return i18n(key, new Integer(sub));
}
***************
*** 390,394 ****
* i18n of a string
*/
! protected final String i18n(String key, Object sub) {
return i18n(key, new Object[]{sub});
}
--- 390,394 ----
* i18n of a string
*/
! public final String i18n(String key, Object sub) {
return i18n(key, new Object[]{sub});
}
***************
*** 397,401 ****
* i18n of a string
*/
! protected final String i18n(String key, Object[] subs) {
// get i18n properties
--- 397,401 ----
* i18n of a string
*/
! public final String i18n(String key, Object[] subs) {
// get i18n properties
***************
*** 439,443 ****
* Right Align a number as simple text
*/
! protected final String align(int num, int width) {
return align(num+"", width, ALIGN_RIGHT);
}
--- 439,443 ----
* Right Align a number as simple text
*/
! public final String align(int num, int width) {
return align(num+"", width, ALIGN_RIGHT);
}
***************
*** 446,450 ****
* Left Align a simple text
*/
! protected final String align(String text, int width) {
return align(text, width, ALIGN_RIGHT);
}
--- 446,450 ----
* Left Align a simple text
*/
! public final String align(String text, int width) {
return align(text, width, ALIGN_RIGHT);
}
***************
*** 453,457 ****
* Align a number as simple text
*/
! protected final String align(int num, int width, int alignment) {
return align(num+"", width, alignment);
}
--- 453,457 ----
* Align a number as simple text
*/
! public final String align(int num, int width, int alignment) {
return align(num+"", width, alignment);
}
***************
*** 463,467 ****
* @param alignment one of LEFT,CENTER,RIGHT
*/
! protected final String align(String txt, int length, int alignment) {
// check txt length
--- 463,467 ----
* @param alignment one of LEFT,CENTER,RIGHT
*/
! public final String align(String txt, int length, int alignment) {
// check txt length
|