Skip to content

The Unified and Autonomous Development Platform

Add image diff view

robin shene798ebdad5d1
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java b/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
index 1329b9fe69..bcfec03d18 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/DiffRenderer.java
@@ -7,8 +7,11 @@ import org.apache.wicket.markup.html.panel.Panel;
import com.gitplex.launcher.loader.ExtensionPoint;
import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.web.component.diff.revision.DiffViewMode;
@ExtensionPoint
public interface DiffRenderer {
- @Nullable Panel render(String panelId, MediaType mediaType, BlobChange change);
+
+ @Nullable Panel render(String panelId, MediaType mediaType, BlobChange change, DiffViewMode viewMode);
+
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
index ebcadca18a..3682d45327 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/BlobDiffPanel.java
@@ -89,7 +89,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {
} else {
Panel diffPanel = null;
for (DiffRenderer renderer: GitPlex.getExtensions(DiffRenderer.class)) {
- diffPanel = renderer.render(CONTENT_ID, blob.getMediaType(), change);
+ diffPanel = renderer.render(CONTENT_ID, blob.getMediaType(), change, diffMode);
if (diffPanel != null)
break;
}
@@ -125,7 +125,7 @@ public class BlobDiffPanel extends Panel implements SourceAware {
} else if (change.getOldBlob().getMediaType().equals(change.getNewBlob().getMediaType())) {
Panel diffPanel = null;
for (DiffRenderer renderer: GitPlex.getExtensions(DiffRenderer.class)) {
- diffPanel = renderer.render(CONTENT_ID, change.getNewBlob().getMediaType(), change);
+ diffPanel = renderer.render(CONTENT_ID, change.getNewBlob().getMediaType(), change, diffMode);
if (diffPanel != null)
break;
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.html b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.html
index fdee620c01..4a9f72713e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.html
@@ -1,3 +1,12 @@
<wicket:panel>
- image diff
+ <table class="image-diff">
+ <tr>
+ <td class="old">
+ <img wicket:id="old" title="Before modification">
+ </td>
+ <td class="new">
+ <img wicket:id="new" title="After modification">
+ </td>
+ </tr>
+ </table>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
index 79bdfb8247..e18932ad44 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffPanel.java
@@ -1,14 +1,102 @@
package com.gitplex.server.web.component.diff.blob.image;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.resource.DynamicImageResource;
+import org.apache.wicket.request.resource.PackageResourceReference;
+import com.gitplex.server.git.Blob;
import com.gitplex.server.git.BlobChange;
+import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.git.GitUtils;
+import com.gitplex.server.util.Provider;
@SuppressWarnings("serial")
public class ImageDiffPanel extends Panel {
+ private final BlobChange change;
+
public ImageDiffPanel(String id, BlobChange change) {
super(id);
+
+ this.change = change;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(newImage("old", change.getOldBlobIdent(), new Provider<Blob>() {
+
+ @Override
+ public Blob get() {
+ return change.getOldBlob();
+ }
+
+ }));
+
+ add(newImage("new", change.getNewBlobIdent(), new Provider<Blob>() {
+
+ @Override
+ public Blob get() {
+ return change.getNewBlob();
+ }
+
+ }));
+
+ }
+
+ private Image newImage(String id, BlobIdent blobIdent, Provider<Blob> blobProvider) {
+ Image image;
+ if (blobIdent.path != null) {
+ add(image = new Image(id, new DynamicImageResource() {
+
+ @Override
+ protected void configureResponse(ResourceResponse response, Attributes attributes) {
+ super.configureResponse(response, attributes);
+ if (!GitUtils.isHash(blobIdent.revision))
+ response.disableCaching();
+ response.setContentType(blobProvider.get().getMediaType().toString());
+ response.setFileName(blobIdent.getName());
+ }
+
+ @Override
+ protected byte[] getImageData(Attributes attributes) {
+ return blobProvider.get().getBytes();
+ }
+ }));
+ BufferedImage bufferedImage;
+ try {
+ bufferedImage = ImageIO.read(new ByteArrayInputStream(blobProvider.get().getBytes()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ image.add(AttributeAppender.append("width", bufferedImage.getWidth()));
+ image.add(AttributeAppender.append("height", bufferedImage.getHeight()));
+ } else {
+ add(image = new Image(id, new PackageResourceReference(ImageDiffPanel.class, "blank.png")));
+ image.add(AttributeAppender.append("width", "64px"));
+ image.add(AttributeAppender.append("height", "64px"));
+ }
+ return image;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new ImageDiffResourceReference()));
+ String script = String.format("gitplex.server.imageDiff.onDomReady('%s');", getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
index 41376320e6..d8bca2a7dc 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffRenderer.java
@@ -5,11 +5,12 @@ import org.apache.wicket.markup.html.panel.Panel;
import com.gitplex.server.git.BlobChange;
import com.gitplex.server.web.component.diff.DiffRenderer;
+import com.gitplex.server.web.component.diff.revision.DiffViewMode;
public class ImageDiffRenderer implements DiffRenderer {
@Override
- public Panel render(String panelId, MediaType mediaType, BlobChange change) {
+ public Panel render(String panelId, MediaType mediaType, BlobChange change, DiffViewMode viewMode) {
if (mediaType.getType().equalsIgnoreCase("image"))
return new ImageDiffPanel(panelId, change);
else
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffResourceReference.java
new file mode 100644
index 0000000000..b11f59810b
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/ImageDiffResourceReference.java
@@ -0,0 +1,26 @@
+package com.gitplex.server.web.component.diff.blob.image;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.request.resource.CssResourceReference;
+
+import com.gitplex.server.web.page.base.BaseDependentResourceReference;
+
+public class ImageDiffResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ImageDiffResourceReference() {
+ super(ImageDiffResourceReference.class, "image-diff.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ImageDiffPanel.class, "image-diff.css")));
+ return dependencies;
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/blank.png b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/blank.png
new file mode 100644
index 0000000000..6a86792138
Binary files /dev/null and b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/blank.png differ
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.css b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.css
new file mode 100644
index 0000000000..bf4d81fb1c
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.css
@@ -0,0 +1,10 @@
+.image-diff {
+ border: 1px solid #D8D8D8;
+}
+.image-diff td {
+ padding: 16px;
+ width: 50%;
+}
+.image-diff td.old {
+ border-right: 1px solid #D8D8D8;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.js
new file mode 100644
index 0000000000..5b29b7d40f
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/image/image-diff.js
@@ -0,0 +1,7 @@
+gitplex.server.imageDiff = {
+ onDomReady: function(containerId) {
+ $("#" + containerId + " img").on("load", function() {
+// $(window).resize();
+ });
+ }
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
index 109792e918..bdb673388d 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
@@ -17,7 +17,6 @@ gitplex.server.revisionDiff = {
gitplex.server.revisionDiff.reposition();
});
gitplex.server.revisionDiff.reposition();
- console.log(window.location.hash);
if (window.location.hash) {
var $anchor = $(window.location.hash);
if ($anchor.length != 0) {
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.js b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.js
index de051f700b..6eb1c64ecc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/project/blob/render/view/blob-view.js
@@ -27,6 +27,10 @@ gitplex.server.blobView = {
$body.outerWidth(width).outerHeight(height);
$body.find(".autofit:visible").first().triggerHandler("autofit", [$body.width(), $body.height()]);
});
- }
+ },
+
+ onWindowLoad: function() {
+
+ }
};