Skip to content

Commit 69333d5

Browse files
committed
regenerateMasterStylesheet refactoring
1 parent 5dffefa commit 69333d5

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/main/java/com/atomgraph/linkeddatahub/resource/admin/pkg/UninstallPackage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.glassfish.jersey.uri.UriComponent;
4949
import org.slf4j.Logger;
5050
import org.slf4j.LoggerFactory;
51-
5251
import java.io.IOException;
5352
import java.net.URI;
5453
import java.nio.charset.StandardCharsets;

src/main/java/com/atomgraph/linkeddatahub/server/util/XSLTMasterUpdater.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,13 @@ public XSLTMasterUpdater(ServletContext servletContext)
7171
*/
7272
public void regenerateMasterStylesheet(List<String> packagePaths) throws IOException
7373
{
74-
regenerateMasterStylesheet(getStaticPath(), packagePaths);
74+
regenerateMasterStylesheet(getStaticPath().resolve("xsl").resolve("layout.xsl"), packagePaths); // TO-DO: move to configuration
7575
}
7676

77-
public void regenerateMasterStylesheet(Path staticDir, List<String> packagePaths) throws IOException
77+
public void regenerateMasterStylesheet(Path masterFile, List<String> packagePaths) throws IOException
7878
{
7979
try
8080
{
81-
Path xslDir = staticDir.resolve("xsl");
82-
Path masterFile = xslDir.resolve("layout.xsl");
83-
8481
// Create fresh XML document
8582
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
8683
factory.setNamespaceAware(true);
@@ -123,7 +120,7 @@ public void regenerateMasterStylesheet(Path staticDir, List<String> packagePaths
123120
stylesheet.appendChild(doc.createTextNode("\n\n"));
124121

125122
// Write to file
126-
Files.createDirectories(xslDir);
123+
Files.createDirectories(masterFile.getParent());
127124
TransformerFactory transformerFactory = TransformerFactory.newInstance();
128125
Transformer transformer = transformerFactory.newTransformer();
129126
transformer.setOutputProperty(OutputKeys.INDENT, "yes");

0 commit comments

Comments
 (0)