From 8195b48b5b72ecec8b2c9fe9c73a89f182059c1c Mon Sep 17 00:00:00 2001 From: griffon Date: Mon, 12 Nov 2007 13:48:44 +0000 Subject: [PATCH] I had to comment some new code in ZLPaintContext to make the code compilable git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@114 6a642e6f-84f6-412e-ac94-c4a38d5a04b0 --- .../zlibrary/core/view/ZLPaintContext.java | 3 ++- src/org/zlibrary/sampleview/Main.java | 11 +++++++++ .../sampleview/SampleApplication.java | 10 ++++++++ src/org/zlibrary/sampleview/SampleView.java | 24 +++++++++++++++++++ .../text/view/impl/ZLTextParagraphCursor.java | 3 +-- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 src/org/zlibrary/sampleview/Main.java create mode 100644 src/org/zlibrary/sampleview/SampleApplication.java create mode 100644 src/org/zlibrary/sampleview/SampleView.java diff --git a/src/org/zlibrary/core/view/ZLPaintContext.java b/src/org/zlibrary/core/view/ZLPaintContext.java index 1847aeca4..58f8012bf 100644 --- a/src/org/zlibrary/core/view/ZLPaintContext.java +++ b/src/org/zlibrary/core/view/ZLPaintContext.java @@ -125,7 +125,7 @@ abstract public class ZLPaintContext { return myBottomMargin; } - public List fontFamilies() { +/* public List fontFamilies() { if (myFamilies.isEmpty()) { fillFamiliesList(myFamilies); } @@ -134,6 +134,7 @@ abstract public class ZLPaintContext { abstract public String realFontFamilyName(String fontFamily); abstract protected void fillFamiliesList(List families); +*/ } diff --git a/src/org/zlibrary/sampleview/Main.java b/src/org/zlibrary/sampleview/Main.java new file mode 100644 index 000000000..7fbe7c9d1 --- /dev/null +++ b/src/org/zlibrary/sampleview/Main.java @@ -0,0 +1,11 @@ +package org.zlibrary.sampleview; + +import org.zlibrary.core.library.ZLibrary; + +public class Main { + public static void main(String[] args) { + ZLibrary.init(); + ZLibrary.run(new SampleApplication()); + ZLibrary.shutdown(); + } +} diff --git a/src/org/zlibrary/sampleview/SampleApplication.java b/src/org/zlibrary/sampleview/SampleApplication.java new file mode 100644 index 000000000..2b0a32edb --- /dev/null +++ b/src/org/zlibrary/sampleview/SampleApplication.java @@ -0,0 +1,10 @@ +package org.zlibrary.sampleview; + +import org.zlibrary.core.application.ZLApplication; + +public class SampleApplication extends ZLApplication { + public SampleApplication() { + super("Sample"); + setView(new SampleView(this, getContext())); + } +} diff --git a/src/org/zlibrary/sampleview/SampleView.java b/src/org/zlibrary/sampleview/SampleView.java new file mode 100644 index 000000000..fb124c1e4 --- /dev/null +++ b/src/org/zlibrary/sampleview/SampleView.java @@ -0,0 +1,24 @@ +package org.zlibrary.sampleview; + +import org.zlibrary.core.view.ZLView; +import org.zlibrary.core.view.ZLPaintContext; + +class SampleView extends ZLView { + SampleView(SampleApplication application, ZLPaintContext context) { + super(application, context); + } + + public void paint() { + ZLPaintContext context = getContext(); + context.drawLine(0, 0, context.getWidth() - 1, context.getHeight() - 1); + context.fillRectangle(context.getWidth() / 2, context.getHeight() / 2, context.getWidth() - 2, context.getHeight() - 2); + + String text = "Hello, World!"; + final int w = context.stringWidth(text); + context.drawString((context.getWidth() - w) / 2, context.stringHeight(), text); + } + + public String caption() { + return "SampleView"; + } +} diff --git a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java b/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java index 6e9ff40d8..094d4e38f 100644 --- a/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java +++ b/src/org/zlibrary/text/view/impl/ZLTextParagraphCursor.java @@ -8,7 +8,6 @@ import org.zlibrary.text.model.entry.ZLTextEntry; import java.util.*; abstract class ZLTextParagraphCursor { - private static abstract class Processor { protected ZLTextParagraph myParagraph; @@ -45,7 +44,7 @@ abstract class ZLTextParagraphCursor { } /*Some useless code in C++ version here. - Is spaceInserted variable used for inserting one separator for multiple spaces?*/ + Is spaceInserted variable used for inserting one separator instead of multiple spaces?*/ public void processTextEntry(ZLTextEntry textEntry) { int dataLength = textEntry.getDataLength();