From: jsimomaa <jani.simomaa@gmail.com>
Date: Thu, 22 Mar 2018 13:44:22 +0000 (+0200)
Subject: Remove duplicate string/regex functionality from Simantics/Misc
X-Git-Tag: v1.43.0~136^2~526
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=refs%2Fchanges%2F30%2F1630%2F3

Remove duplicate string/regex functionality from Simantics/Misc

refs #7836

Change-Id: I485f09891cb0bd60f2e3b53209a3aaa47e5f7d24
---

diff --git a/bundles/org.simantics.modeling/scl/Simantics/Misc.scl b/bundles/org.simantics.modeling/scl/Simantics/Misc.scl
index 8b7662992..e334852ab 100644
--- a/bundles/org.simantics.modeling/scl/Simantics/Misc.scl
+++ b/bundles/org.simantics.modeling/scl/Simantics/Misc.scl
@@ -2,15 +2,6 @@ import "Simantics/Entity" hiding (nameOf)
 include "File"
 import "StandardLibrary" hiding (group)
 
-/*
-importJava "java.io.File" where
-    data File
-    
-    @JavaName "<init>"
-    file :: String -> File
-    
-*/
-
 importJava "java.util.Scanner" where
     data Scanner
     
@@ -29,22 +20,7 @@ importJava "java.util.Scanner" where
     @JavaName "nextLine"
     scanNextLine :: Scanner -> String
 
-importJava "java.util.regex.Pattern" where
-    data Pattern
-    
-    @JavaName "compile"
-    compile :: String -> <Proc> Pattern
-    
-    @JavaName "matcher"
-    matcher :: Pattern -> String -> Matcher
-
-importJava "java.util.regex.Matcher" where
-    data Matcher
-    
-    @JavaName "matches"
-    matches :: Matcher -> Boolean
-    
-    group :: Matcher -> String
+include "String"
 
 importJava "org.simantics.utils.ui.BundleUtils" where
     @JavaName "findFile"