mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

jdks. More work and documentation is still needed.
merge-requests/1/head
Henning Geinitz 2004-04-10 16:42:10 +00:00
rodzic f9eed64292
commit 716187d91d
3 zmienionych plików z 9 dodań i 15 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
ChangeLog
Wyświetl plik

@ -1,6 +1,9 @@
2004-04-10 Henning Meier-Geinitz <henning@meier-geinitz.de> 2004-04-10 Henning Meier-Geinitz <henning@meier-geinitz.de>
* japi/.cvsignore: Updated. * 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> 2004-04-10 Jochen Eisinger <jochen@penguin-breeder.org>

19
japi/Jscanimage.java
Wyświetl plik

@ -53,19 +53,9 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.text.NumberFormat; import java.text.NumberFormat;
import com.sun.java.swing.ImageIcon; import javax.swing.*;
import com.sun.java.swing.JPanel; import javax.swing.border.*;
import com.sun.java.swing.JCheckBox; import javax.swing.event.*;
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;
/* /*
* Main program. * Main program.
@ -292,7 +282,8 @@ public class Jscanimage extends Frame implements WindowListener,
c.gridwidth = GridBagConstraints.REMAINDER; c.gridwidth = GridBagConstraints.REMAINDER;
c.fill = GridBagConstraints.NONE; c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.WEST; c.anchor = GridBagConstraints.WEST;
group.add(cbox, c); if (group != null)
group.add(cbox, c);
addControl(cbox); addControl(cbox);
break; break;
case SaneOption.TYPE_FIXED: case SaneOption.TYPE_FIXED:

2
japi/Sane.c
Wyświetl plik

@ -265,7 +265,7 @@ JNIEXPORT void JNICALL Java_Sane_getOptionNative
} }
else if (sopt->constraint_type == SANE_CONSTRAINT_STRING_LIST) 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; jobjectArray stringList;
int len; /* Gets # elements */ int len; /* Gets # elements */
int i; int i;