yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 09:49:19 +02:00
Code Issues Releases Wiki Activity

compilation problem has been fixed

Browse source 
jar building target has been added


git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@126 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
This commit is contained in:
Nikolay Pultsin 2007-11-13 17:51:06 +00:00
parent 541f1d9121
commit 5ed4b6c5c0
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
build.xml
View file

@ -3,6 +3,7 @@
<property name = "src.dir" value = "src"/> <property name = "src.dir" value = "src"/>
<property name = "bin.dir" value = "bin"/> <property name = "bin.dir" value = "bin"/>
<property name = "test.dir" value= "test"/> <property name = "test.dir" value= "test"/>
<property name = "main.jar" value= "FBReader.jar"/>
<target name = "prepare"> <target name = "prepare">
<mkdir dir = "${bin.dir}" /> <mkdir dir = "${bin.dir}" />
@ -12,6 +13,10 @@
<javac srcdir = "${src.dir}" destdir = "${bin.dir}"/> <javac srcdir = "${src.dir}" destdir = "${bin.dir}"/>
</target> </target>
<target name = "build" depends = "compile">
<jar destfile = "${main.jar}" manifest = "manifest.mf" basedir = "${bin.dir}"/>
</target>
<target name = "test" depends = "prepare"> <target name = "test" depends = "prepare">
<javac srcdir = "${test.dir}" destdir = "${bin.dir}"> <javac srcdir = "${test.dir}" destdir = "${bin.dir}">
<classpath> <classpath>
@ -39,5 +44,9 @@
<delete dir = "${bin.dir}"/> <delete dir = "${bin.dir}"/>
</target> </target>
<target name = "distclean" depends = "clean">
<delete file = "${main.jar}"/>
</target>
<target name = "all" depends = "clean"/> <target name = "all" depends = "clean"/>
</project> </project>

8
src/org/zlibrary/core/application/ZLApplicationWindow.java
View file

@ -47,7 +47,7 @@ abstract public class ZLApplicationWindow {
return; return;
} else { } else {
button.press(); button.press();
ButtonGroup group = button.buttonGroup(); ButtonGroup group = button.getButtonGroup();
Set<ButtonItem> items = group.Items; Set<ButtonItem> items = group.Items;
for (ButtonItem bitem: items) { for (ButtonItem bitem: items) {
setToggleButtonState(bitem); setToggleButtonState(bitem);
@ -55,7 +55,7 @@ abstract public class ZLApplicationWindow {
} }
myToggleButtonLock = false; myToggleButtonLock = false;
} }
application().doAction(button.actionId()); application().doAction(button.getActionId());
} }
public abstract void setToggleButtonState(ButtonItem item); public abstract void setToggleButtonState(ButtonItem item);
@ -90,7 +90,7 @@ abstract public class ZLApplicationWindow {
case ZLApplication::Toolbar::Item::BUTTON: case ZLApplication::Toolbar::Item::BUTTON:
{ {
const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it; const ZLApplication::Toolbar::ButtonItem &button = (const ZLApplication::Toolbar::ButtonItem&)**it;
int id = button.actionId(); int id = button.getActionId();
const bool visible = application().isActionVisible(id); const bool visible = application().isActionVisible(id);
const bool enabled = application().isActionEnabled(id); const bool enabled = application().isActionEnabled(id);
@ -103,7 +103,7 @@ abstract public class ZLApplicationWindow {
enableToolbarSpace = true; enableToolbarSpace = true;
} }
if (!enabled && button.isPressed()) { if (!enabled && button.isPressed()) {
shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.buttonGroup(); shared_ptr<ZLApplication::Toolbar::ButtonGroup> group = button.getButtonGroup();
group->press(0); group->press(0);
application().doAction(group->UnselectAllButtonsActionId); application().doAction(group->UnselectAllButtonsActionId);
myToggleButtonLock = true; myToggleButtonLock = true;