Commit 716187d9 authored by Henning Geinitz's avatar Henning Geinitz

Fixes from David Neary <David@phenix.fr> to make japi work with current

jdks. More work and documentation is still needed.
parent f9eed642
2004-04-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* japi/.cvsignore: Updated.
* japi/Jscanimage.java japi/Sane.c: Fixes from David Neary
<David@phenix.fr> to make japi work with current jdks. More
work and documentation is still needed.
2004-04-10 Jochen Eisinger <jochen@penguin-breeder.org>
......
......@@ -53,19 +53,9 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.NumberFormat;
import com.sun.java.swing.ImageIcon;
import com.sun.java.swing.JPanel;
import com.sun.java.swing.JCheckBox;
import com.sun.java.swing.JComboBox;
import com.sun.java.swing.JLabel;
import com.sun.java.swing.JButton;
import com.sun.java.swing.JSlider;
import com.sun.java.swing.JTextField;
import com.sun.java.swing.SwingConstants;
import com.sun.java.swing.border.BevelBorder;
import com.sun.java.swing.border.TitledBorder;
import com.sun.java.swing.event.ChangeEvent;
import com.sun.java.swing.event.ChangeListener;
import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
/*
* Main program.
......@@ -292,7 +282,8 @@ public class Jscanimage extends Frame implements WindowListener,
c.gridwidth = GridBagConstraints.REMAINDER;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.WEST;
group.add(cbox, c);
if (group != null)
group.add(cbox, c);
addControl(cbox);
break;
case SaneOption.TYPE_FIXED:
......
......@@ -265,7 +265,7 @@ JNIEXPORT void JNICALL Java_Sane_getOptionNative
}
else if (sopt->constraint_type == SANE_CONSTRAINT_STRING_LIST)
{
jclass stringClass = (*env)->FindClass(env, "String");
jclass stringClass = (*env)->FindClass(env, "java/lang/String");
jobjectArray stringList;
int len; /* Gets # elements */
int i;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment