X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Flayouts%2FMixedLayout.java;h=f7eee2cbd8e2dfb2c3f15b5685d4891210676d7c;hb=1d9057cc722b349a0bc370c0860344f59c42fd0f;hp=9585215a1bed7f5f4643c40af8abde6fdac59b58;hpb=e07b29a32091b5291a62158021aed3487ea5cd3a;p=meviz.git
diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
index 9585215..f7eee2c 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/layouts/MixedLayout.java
@@ -39,66 +39,45 @@ public class MixedLayout implements Layout {
public static final String encoding = "UTF-8";
- int currentColumn = 0;
-
- int horizontalColumnsLimit = 2;
-
private AbstractIndexer indexer;
private IndexingContext indexingContext;
- public void columnAdded() {
- currentColumn++;
- if (currentColumn > horizontalColumnsLimit) {
-
- currentColumn = 0;
-
- filesHtml.append("\n");
- }
- }
-
@Override
public void enlistDirectory(final AbstractFile directory) {
dirHtml.append("
");
dirHtml.append(" ==> " + directory.fileName + " | ");
+ + "\"> ==> " + directory.fileName + "
");
dirHtml.append("
\n");
}
@Override
public void enlistFile(final AbstractFile file) {
- finishRow();
final String fullFileName = file.fileName;
- filesHtml.append("\n");
- filesHtml.append(" " + fullFileName + "\n");
filesHtml.append(" ("
+ FilePathParser.getFileSizeDescription(file.getFileLength())
- + ") | \n");
- filesHtml.append("
\n");
+ + ")
\n");
}
@Override
- public void enlistImage(final AbstractFile abstractFile) {
+ public void enlistImage(final Picture picture) {
try {
- final Picture picture = (Picture) abstractFile;
-
final Dimension imageSize = picture.getDimensions();
final List recommendedDimensions = Picture
.getThumbnailDimensions(imageSize);
- Dimension listingDimension = new Dimension(500, 500);
+ Dimension listingDimension = new Dimension(1500, 450);
if (listingDimension.width > imageSize.width)
if (listingDimension.height > imageSize.height)
@@ -107,9 +86,8 @@ public class MixedLayout implements Layout {
final String listingThumbnailUrl = indexer.getThumbnailUrl(picture,
listingDimension, indexingContext);
- startcolumn();
-
- filesHtml.append("");
+ filesHtml.append("\n");
@@ -118,7 +96,7 @@ public class MixedLayout implements Layout {
+ "\"/>\n");
filesHtml.append(" "
+ FilePathParser
- .getFileNameWithoutExtension(picture.fileName)
+ .getFileNameWithoutExtension(picture.fileName)
+ " (");
int count = 0;
@@ -133,17 +111,16 @@ public class MixedLayout implements Layout {
filesHtml.append("");
}
- filesHtml.append(") | \n");
-
- columnAdded();
+ filesHtml.append(")\n");
+ filesHtml.append("");
} catch (final Exception e) {
logger.error(
"Error generating thumbnails for image file: "
+ e.toString()
+ ", thumbnail generation skipped, enlisting as ordinary file instead.",
- e);
- enlistFile(abstractFile);
+ e);
+ enlistFile(picture);
}
}
@@ -154,19 +131,14 @@ public class MixedLayout implements Layout {
final GeneralFile file = (GeneralFile) abstractFile;
- finishRow();
-
filesHtml
- .append("\n");
- filesHtml.append("\n");
-
- filesHtml.append(" |
\n");
+ filesHtml.append("\n");
}
- public void finishRow() {
-
- if (currentColumn == 0)
- return;
-
- while (currentColumn <= horizontalColumnsLimit) {
- filesHtml.append(" | ");
- currentColumn++;
- }
- filesHtml.append("\n");
- currentColumn = 0;
- }
-
/** {@inheritDoc} */
@Override
public String getFileNameSuffix() {
@@ -219,10 +178,10 @@ public class MixedLayout implements Layout {
finalHtml.append("\n");
finalHtml.append("\n");
finalHtml
- .append(" \n");
+ .append(" \n");
finalHtml.append("\n");
finalHtml
- .append("\n");
+ .append("\n");
finalHtml.append("\n");
finalHtml.append("\n");
finalHtml.append("\n");
@@ -230,34 +189,13 @@ public class MixedLayout implements Layout {
if (showTitle)
finalHtml
- .append("" + galleryTitle + "
\n");
-
- finalHtml.append("");
- for (final String p : path)
- finalHtml.append(" / " + p);
- finalHtml.append("
\n");
-
- // append directory listing
- finalHtml.append("\n");
-
- if (path.size() > 0) {
- finalHtml.append("");
- finalHtml.append(" <== .. | ");
- finalHtml.append("
\n");
- }
+ .append("" + galleryTitle + "
\n");
- finalHtml.append(dirHtml.toString());
- finalHtml.append("\n
|
\n");
- finalHtml.append("
\n");
+ showCurrentPath(finalHtml);
- // append file listing
+ listDirectories(finalHtml);
- finishRow();
- finalHtml.append("\n");
finalHtml.append(filesHtml.toString());
- finalHtml.append("\n
\n");
if (doHtmlHeaderAndFooter)
finalHtml.append("\n");
@@ -278,11 +216,27 @@ public class MixedLayout implements Layout {
filesHtml = new StringBuffer();
}
- public void startcolumn() {
- if (currentColumn == 0) {
- filesHtml.append("");
- currentColumn = 1;
+ private void listDirectories(final StringBuffer finalHtml) {
+ finalHtml.append("\n");
+
+ if (path.size() > 0) {
+ finalHtml.append("");
+ finalHtml.append(" <== parent directory | ");
+ finalHtml.append("
\n");
}
+
+ finalHtml.append(dirHtml.toString());
+ finalHtml.append("\n
|
\n");
+ finalHtml.append("
\n");
+ }
+
+ private void showCurrentPath(final StringBuffer finalHtml) {
+ finalHtml.append("");
+ for (final String p : path)
+ finalHtml.append(" / " + p);
+ finalHtml.append("
\n");
}
}