Initial commit

.forgejo/workflows/publish.yml

@@ -0,0 +1,29 @@
+on: [ push ]
+
+jobs:
+  publish:
+    name: Build & Publish
+
+    runs-on: 'docker'
+    
+    permissions:
+      packages: write
+      
+    steps:
+    - name: Setup Java
+      uses: https://github.com/actions/setup-java@v4
+      with:
+        distribution: 'adopt'
+        java-version: 8
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Initialize Gradle
+      uses: https://github.com/gradle/actions/setup-gradle@v3
+    - name: Build
+      run: ./gradlew build
+    - name: Publish
+      run: TL_VERSION=$(git rev-list --count HEAD) ./gradlew publish
+      env:
+        PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}

.gitignore

@@ -0,0 +1,2 @@
+/.idea/
+/.gradle/

README.md

@@ -0,0 +1,3 @@
+# tudbutil
+
+tuddylib v2 (better code edition)

build.gradle

@@ -0,0 +1,76 @@
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+}
+
+repositories {
+    mavenCentral()
+    maven { url = 'https://git.tudbut.de/api/packages/TudbuT/maven' }
+}
+
+configurations {
+    jarLibs
+    reloadQuickly {
+        resolutionStrategy.cacheDynamicVersionsFor(10, 'minutes')
+        resolutionStrategy.cacheChangingModulesFor(10, 'minutes')
+    }
+}
+
+sourceCompatibility = '1.8'
+targetCompatibility = '1.8'
+
+compileJava {
+    options.encoding = "UTF-8"
+}
+
+dependencies {
+    implementation(reloadQuickly('de.tudbut:darkreflection:+'))
+}
+
+javadoc {
+    options.encoding = "UTF-8"
+    source = sourceSets.main.allJava
+    classpath = configurations.implementation
+}
+
+jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
+    from {
+        configurations.jarLibs.collect {
+            it.isDirectory() ? it : zipTree(it)
+        }
+    } {
+        exclude "LICENSE.txt", "META-INF/MANIFSET.MF", "META-INF/maven/**", "META-INF/*.RSA", "META-INF/*.SF"
+    }
+}
+
+//jar.dependsOn("javadoc")
+
+publishing {
+
+    publications {
+        mavenJava(MavenPublication) {
+            groupId = "de.tudbut"
+            version = System.getenv("TL_VERSION")
+            from components.java
+        }
+    }
+
+    repositories {
+        maven {
+            name = "Forgejo"
+            url = uri("https://git.tudbut.de/api/packages/TudbuT/maven")
+
+            credentials(HttpHeaderCredentials) {
+                name = "Authorization"
+                value = "token " + System.getenv("PUBLISH_TOKEN")
+            }
+
+            authentication {
+                header(HttpHeaderAuthentication)
+            }
+        }
+    }
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'tudbutil'
+

src/main/java/de/tudbut/tudbutil/locks/Lock.java

@@ -0,0 +1,22 @@
+package de.tudbut.tudbutil.locks;
+
+import de.tudbut.tudbutil.timing.TimerDuration;
+
+public interface Lock {
+
+    boolean isLocked();
+
+    void lock();
+
+    boolean tryLock();
+
+    void unlock();
+
+    void waitHere();
+
+    void waitHereFor(TimerDuration timeout);
+
+    default void waitHereFor(long timeout) {
+        waitHereFor(TimerDuration.from(timeout));
+    }
+}

src/main/java/de/tudbut/tudbutil/locks/TimedLock.java

@@ -0,0 +1,125 @@
+package de.tudbut.tudbutil.locks;
+
+import de.tudbut.tudbutil.timing.Timed;
+import de.tudbut.tudbutil.timing.Timer;
+import de.tudbut.tudbutil.timing.TimerDuration;
+
+import java.util.function.Function;
+
+public class TimedLock extends UntimedLock implements Timed {
+
+    protected Timer timer;
+
+    public TimedLock() {
+        super();
+    }
+
+    public TimedLock(boolean locked) {
+        super();
+        if (locked)
+            lock();
+    }
+
+    public TimedLock(TimerDuration timeLocked) {
+        super();
+        lock(timeLocked);
+    }
+
+    public TimedLock(long millis) {
+        super();
+        lock(TimerDuration.from(millis));
+    }
+
+    public void lock(TimerDuration duration) {
+        if(duration.typeIsElapsed()) {
+            unlock();
+            return;
+        }
+
+        synchronized (mutex) {
+            timer = new Timer(duration);
+        }
+
+        if (super.isLocked()) {
+            super.unlock();
+        }
+        super.lock();
+    }
+
+    public void changeLockTime(Function<TimerDuration, TimerDuration> f, TimerDuration defaultIfUnlocked) {
+        if (!isLocked()) {
+            lock(f.apply(defaultIfUnlocked));
+            return;
+        }
+
+        synchronized (mutex) {
+            lock(f.apply(timer.timeLeft()));
+        }
+    }
+
+    @Override
+    public void unlock() {
+        synchronized (mutex) {
+            timer = new Timer(TimerDuration.elapsed());
+        }
+
+        super.unlock();
+    }
+
+    @Override
+    public boolean isLocked() {
+        if (super.isLocked() && timer.hasElapsed()) {
+            unlock();
+        }
+
+        return timer.hasElapsed();
+    }
+
+    @Override
+    public boolean tryLock() {
+        synchronized (mutex) {
+            timer = new Timer(TimerDuration.infinite());
+        }
+
+        if (super.isLocked()) {
+            super.unlock();
+        }
+
+        return super.tryLock();
+    }
+
+    public void lock(long millis) {
+        this.lock(TimerDuration.from(millis));
+    }
+
+    @Override
+    public void lock() {
+        this.lock(TimerDuration.infinite());
+    }
+
+    @Override
+    public void waitHere() {
+        while (isLocked()) {
+            TimerDuration t = timer.timeLeft();
+            super.waitHereFor(t);
+        }
+    }
+
+    @Override
+    public void waitHereFor(TimerDuration timeout) {
+        Timer localTimer = new Timer(timeout);
+        while (isLocked()) {
+            super.waitHereFor(localTimer.timeLeft().min(timer.timeLeft()));
+        }
+    }
+
+    @Override
+    public boolean hasElapsed() {
+        return !isLocked();
+    }
+
+    @Override
+    public TimerDuration timeLeft() {
+        return timer.timeLeft();
+    }
+}

src/main/java/de/tudbut/tudbutil/locks/UntimedLock.java

@@ -0,0 +1,104 @@
+package de.tudbut.tudbutil.locks;
+
+import de.tudbut.tudbutil.timing.TimePoint;
+import de.tudbut.tudbutil.timing.Timer;
+import de.tudbut.tudbutil.timing.TimerDuration;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class UntimedLock implements Lock {
+
+    protected final Object condvar = new Object();
+    protected final Object mutex = new Object();
+    protected final AtomicInteger waiting = new AtomicInteger(0);
+    protected boolean locked = false;
+    protected boolean double_unlock = false;
+
+    public UntimedLock() {
+    }
+
+    public UntimedLock(boolean locked) {
+        this.locked = locked;
+    }
+
+    @Override
+    public boolean isLocked() {
+        return locked;
+    }
+
+    @Override
+    public void lock() {
+        synchronized (mutex) {
+            locked = true;
+            double_unlock = false;
+        }
+    }
+
+    @Override
+    public boolean tryLock() {
+        synchronized (mutex) {
+            if (!double_unlock) {
+                locked = true;
+                return true;
+            }
+            double_unlock = false;
+        }
+        return false;
+    }
+
+    @Override
+    public void unlock() {
+        synchronized (mutex) {
+            if (!locked) {
+                double_unlock = true;
+                return;
+            }
+            locked = false;
+            synchronized (condvar) {
+                condvar.notifyAll();
+            }
+        }
+    }
+
+    @Override
+    public void waitHere() {
+        waiting.incrementAndGet();
+
+        while (locked) {
+            synchronized (condvar) {
+                try {
+                    condvar.wait();
+                } catch (InterruptedException ignored) {}
+            }
+        }
+
+        waiting.decrementAndGet();
+        while (waiting.get() > 0) {
+            Thread.yield();
+        }
+    }
+
+    @Override
+    public void waitHereFor(TimerDuration timeout) {
+        waiting.incrementAndGet();
+
+        Timer timer = new Timer(timeout);
+        while (locked && !timer.hasElapsed()) {
+            synchronized (condvar) {
+                TimerDuration t = timer.timeLeft();
+                try {
+                    if (t.typeIsReal())
+                        condvar.wait(t.toReal());
+                    if (t.typeIsInfinite())
+                        condvar.wait();
+                } catch (InterruptedException ignored) {
+                }
+            }
+        }
+
+        waiting.decrementAndGet();
+        while (waiting.get() > 0) {
+            Thread.yield();
+        }
+    }
+}

src/main/java/de/tudbut/tudbutil/timing/TimePoint.java

@@ -0,0 +1,46 @@
+package de.tudbut.tudbutil.timing;
+
+public class TimePoint {
+
+    private long time = System.currentTimeMillis();
+
+    public TimePoint() {}
+
+    public TimePoint(long time) {
+        this.time = time;
+    }
+
+    public long get() {
+        return time;
+    }
+
+    public void tick() {
+        time = System.currentTimeMillis();
+    }
+
+    public void set(long time) {
+        this.time = time;
+    }
+
+    public long elapsed() {
+        return System.currentTimeMillis() - time;
+    }
+
+    public long elapsedAndTick() {
+        long prev = time;
+        tick();
+        return System.currentTimeMillis() - prev;
+    }
+
+    public boolean hasElapsed(long millis) {
+        return elapsed() >= millis;
+    }
+
+    public long remainingUntilPoint(long time) {
+        return time - this.time;
+    }
+
+    public long remainingUntilElapsed(long millis) {
+        return millis - elapsed();
+    }
+}

src/main/java/de/tudbut/tudbutil/timing/Timed.java

@@ -0,0 +1,12 @@
+package de.tudbut.tudbutil.timing;
+
+public interface Timed {
+
+    boolean hasElapsed();
+
+    default long timeLeftMillis() {
+        return timeLeft().toReal();
+    }
+
+    TimerDuration timeLeft();
+}

src/main/java/de/tudbut/tudbutil/timing/Timer.java

@@ -0,0 +1,38 @@
+package de.tudbut.tudbutil.timing;
+
+public class Timer implements Timed {
+
+    public final TimePoint start;
+    public TimerDuration duration;
+
+    public Timer(TimerDuration duration) {
+        this(new TimePoint(), duration);
+    }
+
+    public Timer(long start, TimerDuration duration) {
+        this(new TimePoint(start), duration);
+    }
+
+    public Timer(long duration) {
+        this(new TimePoint(), TimerDuration.from(duration));
+    }
+
+    public Timer(long start, long duration) {
+        this(new TimePoint(start), TimerDuration.from(duration));
+    }
+
+    public Timer(TimePoint start, TimerDuration duration) {
+        this.start = start;
+        this.duration = duration;
+    }
+
+    @Override
+    public boolean hasElapsed() {
+        return duration.typeIsElapsed() || (!duration.typeIsInfinite() && start.hasElapsed(duration.toReal()));
+    }
+
+    @Override
+    public TimerDuration timeLeft() {
+        return duration.with(start.remainingUntilElapsed(duration.toReal()));
+    }
+}

src/main/java/de/tudbut/tudbutil/timing/TimerDuration.java

@@ -0,0 +1,81 @@
+package de.tudbut.tudbutil.timing;
+
+public class TimerDuration {
+
+    public enum Type {
+        Elapsed,
+        Real,
+        Infinite,
+        ;
+    }
+
+    private final Type type;
+    private final long millis;
+
+    private TimerDuration(Type t, long l) {
+        type = t;
+        millis = l;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public long toReal() {
+        return millis;
+    }
+
+    public boolean typeIsElapsed() {
+        return type == Type.Elapsed;
+    }
+
+    public boolean typeIsReal() {
+        return type == Type.Real;
+    }
+
+    public boolean typeIsInfinite() {
+        return type == Type.Infinite;
+    }
+
+    public TimerDuration min(TimerDuration t) {
+        switch (type) {
+            case Elapsed:
+                return this;
+            case Real:
+                return new TimerDuration(Type.Real, Math.min(t.millis, millis));
+            case Infinite:
+                return t;
+        }
+        throw new AssertionError();
+    }
+
+    public TimerDuration with(long millis) {
+        switch (type) {
+            case Elapsed:
+            case Infinite:
+                return this;
+            case Real:
+                return new TimerDuration(type, millis);
+        }
+        throw new AssertionError();
+    }
+
+    public static TimerDuration elapsed() {
+        return new TimerDuration(Type.Elapsed, 0);
+    }
+
+    public static TimerDuration of(long millis) {
+        return new TimerDuration(millis <= 0 ? Type.Elapsed : Type.Real, millis);
+    }
+
+    public static TimerDuration infinite() {
+        return new TimerDuration(Type.Infinite, Long.MAX_VALUE);
+    }
+
+    public static TimerDuration from(long millis) {
+        if (millis == Long.MAX_VALUE)
+            return infinite();
+
+        return of(millis);
+    }
+}