Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Extension for Libreoffice 6.3/6.4 #2

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Update Extension for Libreoffice 6.3/6.4 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b20b12
Update Extension for Libreoffice 6.4
kalinjul Apr 22, 2020
01e776f
release version 0.2.0
kalinjul Apr 22, 2020
5df1a8b
Prepare for next snapshot 0.2.1-SNAPSHOT
kalinjul Apr 22, 2020
5ebb503
Remove commented code
kalinjul Apr 23, 2020
02bb843
change java compiler version to 1.8
kalinjul Apr 30, 2020
1e702c4
Show error dialog if a check failed
kalinjul Apr 30, 2020
d7c3515
Fix graphic traversal
kalinjul Apr 30, 2020
6bc7d1f
Fix detection of forms
kalinjul Apr 30, 2020
b167809
Prepare for next snapshot 0.2.2-SNAPSHOT
kalinjul Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
target
target
.settings
.project
.classpath
3 changes: 1 addition & 2 deletions accessodf-addon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@
<parent>
<groupId>be.docarch</groupId>
<artifactId>accessodf</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.2.2-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
<artifactId>accessodf-addon</artifactId>
<version>0.1.0-SNAPSHOT</version>
<packaging>oxt</packaging>
<name>accessodf :: Addon</name>
<dependencies>
Expand Down
9 changes: 9 additions & 0 deletions accessodf-addon/src/main/java/be/docarch/accessodf/ooo/AccessODFAddOn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@
import java.util.logging.FileHandler;
import java.util.logging.SimpleFormatter;

import com.sun.star.beans.Property;
import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XChild;
import com.sun.star.container.XEnumeration;
import com.sun.star.container.XEnumerationAccess;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.uno.XComponentContext;
import com.sun.star.frame.XModel;
Expand All @@ -38,6 +42,7 @@

import com.sun.star.lang.XSingleComponentFactory;
import com.sun.star.registry.XRegistryKey;
import com.sun.star.ui.XUIElement;
import com.sun.star.lib.uno.helper.WeakBase;
import com.sun.star.lib.uno.helper.Factory;

Expand All @@ -63,6 +68,10 @@ public final class AccessODFAddOn extends WeakBase
private File logFile = null;
private int counter = 0;

/**
* ProtocolHandler
* @param context
*/
public AccessODFAddOn( XComponentContext context )
{
m_xContext = context;
Expand Down
25 changes: 25 additions & 0 deletions accessodf-addon/src/main/java/be/docarch/accessodf/ooo/ChecksFailedException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package be.docarch.accessodf.ooo;

import java.util.List;

public class ChecksFailedException extends Exception {
private static final long serialVersionUID = 7337389404514647563L;
private List<Exception> exceptions;

public ChecksFailedException(List<Exception> exceptions) {
this.exceptions = exceptions;
}

@Override
public String getMessage() {
StringBuilder sb = new StringBuilder();
String delim = "";
for (Exception exception : exceptions) {
String message = exception.getMessage();
sb.append(message);
sb.append(delim);
delim = "\n";
}
return sb.toString();
}
}
40 changes: 24 additions & 16 deletions accessodf-addon/src/main/java/be/docarch/accessodf/ooo/IssueManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,14 @@ public IssueManager(Document document,

}

public void refresh() throws IllegalArgumentException,
RepositoryException,
UnknownPropertyException,
NoSuchElementException,
WrappedTargetException,
PropertyVetoException,
ParseException,
IOException,
com.sun.star.uno.Exception {
public void refresh() throws IOException,
com.sun.star.uno.Exception,
ChecksFailedException {

settings.loadData();
File odtFile = null;

ArrayList<Exception> exceptions = new ArrayList<Exception>();

for (Checker checker : checkers.list()) {
if (checker instanceof RemoteRunnableChecker) {
Expand All @@ -150,20 +146,32 @@ public void refresh() throws IllegalArgumentException,
}
RemoteRunnableChecker remoteChecker = (RemoteRunnableChecker)checker;
remoteChecker.setOdtFile(odtFile);
if (remoteChecker.run()) {
document.removeAccessibilityData(remoteChecker.getIdentifier());
Report report = remoteChecker.getAccessibilityReport();
if (report != null) {
document.importAccessibilityData(report.getFile(), remoteChecker.getIdentifier(), report.getName());
}

try {
remoteChecker.run();
document.removeAccessibilityData(remoteChecker.getIdentifier());
Report report = remoteChecker.getAccessibilityReport();
if (report != null) {
document.importAccessibilityData(report.getFile(), remoteChecker.getIdentifier(), report.getName());
}
} catch (Exception e) {
exceptions.add(e);
}
} else if (checker instanceof RunnableChecker) {
((RunnableChecker)checker).run();
try {
((RunnableChecker)checker).run();
} catch (Exception e) {
exceptions.add(e);
}
}
}

// Load accessibility issues from metadata
loadMetadata();

if (!exceptions.isEmpty()) {
throw new ChecksFailedException(exceptions);
}
}

public void clear() throws IllegalArgumentException,
Expand Down
92 changes: 45 additions & 47 deletions accessodf-addon/src/main/java/be/docarch/accessodf/ooo/MainChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import com.sun.star.container.XEnumerationAccess;
import com.sun.star.container.XEnumeration;
import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameContainer;
import com.sun.star.container.XNamed;
import com.sun.star.graphic.XGraphic;
import com.sun.star.text.XTextFramesSupplier;
Expand Down Expand Up @@ -67,6 +68,8 @@
import com.sun.star.rdf.XNamedGraph;
import com.sun.star.drawing.XDrawPage;
import com.sun.star.drawing.XDrawPageSupplier;
import com.sun.star.form.XForm;
import com.sun.star.form.XFormComponent;
import com.sun.star.form.XFormsSupplier2;
import com.sun.star.linguistic2.XLanguageGuessing;

Expand Down Expand Up @@ -171,61 +174,51 @@ public String toString() {
return getIdentifier();
}

public boolean run(){
public void run() throws Exception{

//document.removeAccessibilityData(getIdentifier());

date = new Date();
reportName = MainChecker.class.getCanonicalName()
+ "/" + new SimpleDateFormat("yyyy-MM-dd'T'HH.mm.ss").format(new Date()) + ".rdf";

try {

settings.loadData();
daisyChecks = settings.daisyChecks();
detectedIssues.clear();
detectedChecks.clear();
textMetaMap.clear();
settings.loadData();
daisyChecks = settings.daisyChecks();
detectedIssues.clear();
detectedChecks.clear();
textMetaMap.clear();

// Traverse document
traverseDocument();
// Traverse document
traverseDocument();

// Save detected issues in RDF
// Save detected issues in RDF

XURI[] types = new XURI[]{ URI.create(document.xContext, getIdentifier()) };
XURI graphURI = null;
try {
graphURI = document.xDMA.addMetadataFile(document.metaFolder + reportName, types);
} catch (ElementExistException e) {
graphURI = URI.create(document.xContext, document.metaFolderURI.getStringValue() + reportName);
}
XURI[] types = new XURI[]{ URI.create(document.xContext, getIdentifier()) };
XURI graphURI = null;
try {
graphURI = document.xDMA.addMetadataFile(document.metaFolder + reportName, types);
} catch (ElementExistException e) {
graphURI = URI.create(document.xContext, document.metaFolderURI.getStringValue() + reportName);
}

XNamedGraph graph = document.xRepository.getGraph(graphURI);
Assertions assertions = new Assertions(graph, document);
if (detectedIssues.isEmpty()) {
// Create dummy assertion to indicate that the document is validated
assertions.create(new Issue(null, dummyCheck, this, date)).write();
}
for (Issue i : detectedIssues) {
if (detectedChecks.get(i.getCheck()) <= 10) {
assertions.create(i).write();
}
XNamedGraph graph = document.xRepository.getGraph(graphURI);
Assertions assertions = new Assertions(graph, document);
if (detectedIssues.isEmpty()) {
// Create dummy assertion to indicate that the document is validated
assertions.create(new Issue(null, dummyCheck, this, date)).write();
}
for (Issue i : detectedIssues) {
if (detectedChecks.get(i.getCheck()) <= 10) {
assertions.create(i).write();
}
for (Check c : detectedChecks.keySet()) {
if (detectedChecks.get(c) > 10) {
assertions.create(new Issue(null, c, this, date, detectedChecks.get(c))).write();
}
}
for (Check c : detectedChecks.keySet()) {
if (detectedChecks.get(c) > 10) {
assertions.create(new Issue(null, c, this, date, detectedChecks.get(c))).write();
}

document.setModified();

return true;

} catch (Exception e) {
logger.log(Level.SEVERE, null, e);
}

return false;
document.setModified();
}

private void traverseDocument() throws IllegalArgumentException,
Expand Down Expand Up @@ -296,7 +289,7 @@ private void traverseDocument() throws IllegalArgumentException,
if (daisyChecks) {
if (document.docProperties.getTitle().length() == 0) { metadata.add(DaisyCheck.ID.A_EmptyTitleField.name()); }
}
if (xSuppForms.hasForms()) { metadata.add(GeneralCheck.ID.A_HasForms.name()); }
if (xSuppForms.hasForms() && xSuppForms.getForms().getElementNames().length > 0) { metadata.add(GeneralCheck.ID.A_HasForms.name()); }
if (numberOfTitles == 0) { metadata.add(GeneralCheck.ID.A_NoTitle.name()); }
if (numberOfHeadings == 0) { metadata.add(GeneralCheck.ID.A_NoHeadings.name()); }
if (metadata.size() > 0) {
Expand Down Expand Up @@ -978,17 +971,24 @@ private void traverseGraphicObjects(XIndexAccess graphicObjects)
String url = null;
String fileExtension = null;
String mimeType = null;
XPropertySet xGraphicDescriptor = null;
boolean linked = false;
boolean animated = false;

Collection<String> graphicMetadata = new ArrayList<String>();

for (int i=0; i<graphicObjects.getCount(); i++) {

graphicObject = graphicObjects.getByIndex(i);
properties = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, graphicObject);
graphic = (XGraphic) AnyConverter.toObject(XGraphic.class, properties.getPropertyValue("Graphic"));
xGraphicDescriptor = UnoRuntime.queryInterface(XPropertySet.class, graphic);

title = AnyConverter.toString(properties.getPropertyValue("Title"));
description = AnyConverter.toString(properties.getPropertyValue("Description"));
url = AnyConverter.toString(properties.getPropertyValue("GraphicURL"));
linked = AnyConverter.toBoolean(xGraphicDescriptor.getPropertyValue("Linked"));
url = AnyConverter.toString(xGraphicDescriptor.getPropertyValue("OriginURL"));
animated = AnyConverter.toBoolean(xGraphicDescriptor.getPropertyValue("Animated"));

TextContentAnchorType anchorType = (TextContentAnchorType)AnyConverter.toObject(
TextContentAnchorType.class, properties.getPropertyValue("AnchorType"));
Expand All @@ -998,12 +998,10 @@ private void traverseGraphicObjects(XIndexAccess graphicObjects)
if (title.length() == 0) {
graphicMetadata.add(GeneralCheck.ID.A_ImageWithoutAlt.name());
}
if (url.startsWith("vnd.sun.star.GraphicObject:")) {

if (!linked) {
if (daisyChecks) {
graphic = (XGraphic)AnyConverter.toObject(
XGraphic.class, properties.getPropertyValue("Graphic"));
mediaProperties = (XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, graphic);
mimeType = AnyConverter.toString(mediaProperties.getPropertyValue("MimeType"));
mimeType = AnyConverter.toString(xGraphicDescriptor.getPropertyValue("MimeType"));
if (!mimeType.equals("image/jpeg") &&
!mimeType.equals("image/png") &&
!mimeType.equals("image/x-vclgraphic")) {
Expand Down
21 changes: 10 additions & 11 deletions accessodf-addon/src/main/java/be/docarch/accessodf/ooo/UnoAwtUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package be.docarch.accessodf.ooo;

import com.sun.star.awt.MessageBoxButtons;
import com.sun.star.awt.MessageBoxType;
import com.sun.star.awt.Rectangle;
import com.sun.star.awt.XMessageBox;
import com.sun.star.awt.XMessageBoxFactory;
Expand Down Expand Up @@ -103,17 +104,15 @@ public static String showSaveAsDialog(String filename, String filterName, String
return sStorePath;
}

public static short showMessageBox(XWindowPeer parentWindowPeer, String messageBoxType, int messageBoxButtons, String messageBoxTitle, String message) {
public static short showMessageBox(XWindowPeer parentWindowPeer, MessageBoxType messageBoxType, int messageBoxButtons, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxType == null || messageBoxTitle == null || message == null) {
return 0;
}

// Initialize the message box factory
XMessageBoxFactory messageBoxFactory = (XMessageBoxFactory) UnoRuntime.queryInterface(XMessageBoxFactory.class, parentWindowPeer.getToolkit());

Rectangle messageBoxRectangle = new Rectangle();

XMessageBox box = messageBoxFactory.createMessageBox(parentWindowPeer, messageBoxRectangle, messageBoxType, messageBoxButtons, messageBoxTitle, message);
XMessageBox box = messageBoxFactory.createMessageBox(parentWindowPeer, messageBoxType, messageBoxButtons, messageBoxTitle, message);
return box.execute();
}

Expand All @@ -122,54 +121,54 @@ public static short showInfoMessageBox(XWindowPeer parentWindowPeer, String mess
return 0;
}

return showMessageBox(parentWindowPeer, "infobox", MessageBoxButtons.BUTTONS_OK, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.INFOBOX, MessageBoxButtons.BUTTONS_OK, messageBoxTitle, message);
}

public static short showErrorMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "errorbox", MessageBoxButtons.BUTTONS_OK, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.ERRORBOX, MessageBoxButtons.BUTTONS_OK, messageBoxTitle, message);
}

public static short showYesNoWarningMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "warningbox", MessageBoxButtons.BUTTONS_YES_NO + MessageBoxButtons.DEFAULT_BUTTON_NO, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.WARNINGBOX, MessageBoxButtons.BUTTONS_YES_NO + MessageBoxButtons.DEFAULT_BUTTON_NO, messageBoxTitle, message);
}

public static short showOkCancelWarningMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "warningbox", MessageBoxButtons.BUTTONS_OK_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_OK, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.WARNINGBOX, MessageBoxButtons.BUTTONS_OK_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_OK, messageBoxTitle, message);
}

public static short showQuestionMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "querybox", MessageBoxButtons.BUTTONS_YES_NO_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_YES, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.QUERYBOX, MessageBoxButtons.BUTTONS_YES_NO_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_YES, messageBoxTitle, message);
}

public static short showAbortRetryIgnoreErrorMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "errorbox", MessageBoxButtons.BUTTONS_ABORT_IGNORE_RETRY + MessageBoxButtons.DEFAULT_BUTTON_RETRY, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.ERRORBOX, MessageBoxButtons.BUTTONS_ABORT_IGNORE_RETRY + MessageBoxButtons.DEFAULT_BUTTON_RETRY, messageBoxTitle, message);
}

public static short showRetryCancelErrorMessageBox(XWindowPeer parentWindowPeer, String messageBoxTitle, String message) {
if (parentWindowPeer == null || messageBoxTitle == null || message == null) {
return 0;
}

return showMessageBox(parentWindowPeer, "errorbox", MessageBoxButtons.BUTTONS_RETRY_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_CANCEL, messageBoxTitle, message);
return showMessageBox(parentWindowPeer, MessageBoxType.ERRORBOX, MessageBoxButtons.BUTTONS_RETRY_CANCEL + MessageBoxButtons.DEFAULT_BUTTON_CANCEL, messageBoxTitle, message);
}
}
Loading